aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/netpoll.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-02-09 09:24:36 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-11 02:19:25 -0500
commit4ec93edb14fe5fdee9fae6335f2cbba204627eac (patch)
treeb768f96942b5d19f5bc36b47262c42a8a7acdd7f /net/core/netpoll.c
parent9d6f229fc45b6ac268020c0c8eff29e94bb34381 (diff)
[NET] CORE: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r--net/core/netpoll.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 823215d8e90f..da1019451ccb 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -237,13 +237,13 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
237{ 237{
238 int status = NETDEV_TX_BUSY; 238 int status = NETDEV_TX_BUSY;
239 unsigned long tries; 239 unsigned long tries;
240 struct net_device *dev = np->dev; 240 struct net_device *dev = np->dev;
241 struct netpoll_info *npinfo = np->dev->npinfo; 241 struct netpoll_info *npinfo = np->dev->npinfo;
242 242
243 if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) { 243 if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
244 __kfree_skb(skb); 244 __kfree_skb(skb);
245 return; 245 return;
246 } 246 }
247 247
248 /* don't get messages out of order, and no recursion */ 248 /* don't get messages out of order, and no recursion */
249 if (skb_queue_len(&npinfo->txq) == 0 && 249 if (skb_queue_len(&npinfo->txq) == 0 &&
@@ -676,7 +676,7 @@ int netpoll_setup(struct netpoll *np)
676 } 676 }
677 677
678 atleast = jiffies + HZ/10; 678 atleast = jiffies + HZ/10;
679 atmost = jiffies + 4*HZ; 679 atmost = jiffies + 4*HZ;
680 while (!netif_carrier_ok(ndev)) { 680 while (!netif_carrier_ok(ndev)) {
681 if (time_after(jiffies, atmost)) { 681 if (time_after(jiffies, atmost)) {
682 printk(KERN_NOTICE 682 printk(KERN_NOTICE
@@ -772,9 +772,9 @@ void netpoll_cleanup(struct netpoll *np)
772 np->dev->npinfo = NULL; 772 np->dev->npinfo = NULL;
773 if (atomic_dec_and_test(&npinfo->refcnt)) { 773 if (atomic_dec_and_test(&npinfo->refcnt)) {
774 skb_queue_purge(&npinfo->arp_tx); 774 skb_queue_purge(&npinfo->arp_tx);
775 skb_queue_purge(&npinfo->txq); 775 skb_queue_purge(&npinfo->txq);
776 cancel_rearming_delayed_work(&npinfo->tx_work); 776 cancel_rearming_delayed_work(&npinfo->tx_work);
777 flush_scheduled_work(); 777 flush_scheduled_work();
778 778
779 kfree(npinfo); 779 kfree(npinfo);
780 } 780 }