diff options
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index ea51f8d02eb8..e8e05cebd95a 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -669,14 +669,14 @@ int netpoll_setup(struct netpoll *np) | |||
669 | printk(KERN_INFO "%s: device %s not up yet, forcing it\n", | 669 | printk(KERN_INFO "%s: device %s not up yet, forcing it\n", |
670 | np->name, np->dev_name); | 670 | np->name, np->dev_name); |
671 | 671 | ||
672 | rtnl_shlock(); | 672 | rtnl_lock(); |
673 | if (dev_change_flags(ndev, ndev->flags | IFF_UP) < 0) { | 673 | if (dev_change_flags(ndev, ndev->flags | IFF_UP) < 0) { |
674 | printk(KERN_ERR "%s: failed to open %s\n", | 674 | printk(KERN_ERR "%s: failed to open %s\n", |
675 | np->name, np->dev_name); | 675 | np->name, np->dev_name); |
676 | rtnl_shunlock(); | 676 | rtnl_unlock(); |
677 | goto release; | 677 | goto release; |
678 | } | 678 | } |
679 | rtnl_shunlock(); | 679 | rtnl_unlock(); |
680 | 680 | ||
681 | atleast = jiffies + HZ/10; | 681 | atleast = jiffies + HZ/10; |
682 | atmost = jiffies + 4*HZ; | 682 | atmost = jiffies + 4*HZ; |