Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-26 08:32:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60 from rickyzhang82/sheep-net-bug-fix

Browse Source 
Make sheep_net driver work with newer versions of the Linux kernel.
This commit is contained in:
asvitkine 2014-09-19 22:21:58 -04:00
commit c2b519ee1e
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c
View File

@ -21,7 +21,11 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/init.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
#define LINUX_3_15
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
#define LINUX_26_35 #define LINUX_26_35
@ -153,6 +157,9 @@ struct SheepVars {
u32 ipfilter; /* Only receive IP packets destined for this address (host byte order) */ u32 ipfilter; /* Only receive IP packets destined for this address (host byte order) */
char eth_addr[6]; /* Hardware address of the Ethernet card */ char eth_addr[6]; /* Hardware address of the Ethernet card */
char fake_addr[6]; /* Local faked hardware address (what SheepShaver sees) */ char fake_addr[6]; /* Local faked hardware address (what SheepShaver sees) */
#ifdef LINUX_3_15
atomic_t got_packet;
#endif
}; };
@ -390,7 +397,12 @@ static ssize_t sheep_net_read(struct file *f, char *buf, size_t count, loff_t *o
break; break;
/* No packet in queue and in blocking mode, so block */ /* No packet in queue and in blocking mode, so block */
#ifdef LINUX_3_15
atomic_set(&v->got_packet, 0);
wait_event_interruptible(v->wait, atomic_read(&v->got_packet));
#else
interruptible_sleep_on(&v->wait); interruptible_sleep_on(&v->wait);
#endif
/* Signal received? Then bail out */ /* Signal received? Then bail out */
if (signal_pending(current)) if (signal_pending(current))
@ -731,7 +743,17 @@ static int sheep_net_receiver(struct sk_buff *skb, struct net_device *dev, struc
skb_queue_tail(&v->queue, skb); skb_queue_tail(&v->queue, skb);
/* Unblock blocked read */ /* Unblock blocked read */
#ifdef LINUX_3_15
atomic_set(&v->got_packet, 1);
wake_up_interruptible(&v->wait);
#else
wake_up(&v->wait); wake_up(&v->wait);
#endif
return 0; return 0;
drop: drop: