Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-11 10:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Apply patch for 3.15 kernel

Browse Source
This commit is contained in:
Ricky Zhang 2014-09-18 11:38:06 -04:00
parent 70ac4e94e3
commit b5b415da0d
No known key found for this signature in database
GPG Key ID: 9E291B0BFD83C3B8
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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
int got_packet;
#endif
}; };
@ -389,8 +396,17 @@ static ssize_t sheep_net_read(struct file *f, char *buf, size_t count, loff_t *o
if (skb != NULL || (f->f_flags & O_NONBLOCK)) if (skb != NULL || (f->f_flags & O_NONBLOCK))
break; break;
/*packet is not available*/
#ifdef LINUX_3_15
v->got_packet = 0;
#endif
/* No packet in queue and in blocking mode, so block */ /* No packet in queue and in blocking mode, so block */
interruptible_sleep_on(&v->wait); #ifdef LINUX_3_15
wait_event_interruptible(v->wait, v->got_packet == 1);
#else
interruptible_sleep_on(&v->wait);
#endif
/* Signal received? Then bail out */ /* Signal received? Then bail out */
if (signal_pending(current)) if (signal_pending(current))
@ -670,7 +686,7 @@ error:
case SIOC_MOL_SET_IPFILTER: case SIOC_MOL_SET_IPFILTER:
v->ipfilter = arg; v->ipfilter = arg;
return 0; return 0;
default: default:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
@ -730,6 +746,10 @@ static int sheep_net_receiver(struct sk_buff *skb, struct net_device *dev, struc
/* Enqueue packet */ /* Enqueue packet */
skb_queue_tail(&v->queue, skb); skb_queue_tail(&v->queue, skb);
#ifdef LINUX_3_15
v->got_packet = 1;
#endif
/* Unblock blocked read */ /* Unblock blocked read */
wake_up(&v->wait); wake_up(&v->wait);
return 0; return 0;