From 5192d6080568b309058b755512fca66c95249b4e Mon Sep 17 00:00:00 2001 From: Ricky Zhang Date: Fri, 19 Sep 2014 09:59:23 -0400 Subject: [PATCH] Fix space/tab indention --- .../src/Unix/Linux/NetDriver/sheep_net.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c b/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c index 2e3ead5e..ad55fb65 100644 --- a/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c +++ b/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c @@ -158,7 +158,7 @@ struct SheepVars { char eth_addr[6]; /* Hardware address of the Ethernet card */ char fake_addr[6]; /* Local faked hardware address (what SheepShaver sees) */ #ifdef LINUX_3_15 - atomic_t got_packet; + atomic_t got_packet; #endif }; @@ -397,12 +397,12 @@ static ssize_t sheep_net_read(struct file *f, char *buf, size_t count, loff_t *o break; /* 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); - #endif +#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); +#endif /* Signal received? Then bail out */ if (signal_pending(current)) @@ -682,7 +682,7 @@ error: case SIOC_MOL_SET_IPFILTER: v->ipfilter = arg; - return 0; + return 0; default: return -ENOIOCTLCMD; @@ -742,18 +742,18 @@ static int sheep_net_receiver(struct sk_buff *skb, struct net_device *dev, struc /* Enqueue packet */ skb_queue_tail(&v->queue, skb); - /* Unblock blocked read */ - #ifdef LINUX_3_15 + /* Unblock blocked read */ +#ifdef LINUX_3_15 - atomic_set(&v->got_packet, 1); + atomic_set(&v->got_packet, 1); - wake_up_interruptible(&v->wait); + wake_up_interruptible(&v->wait); - #else +#else - wake_up(&v->wait); + wake_up(&v->wait); - #endif +#endif return 0; drop: