diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 12:09:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 12:09:13 -0700 |
| commit | 2f7043a37708110aa98262b91702da6bc32e17b6 (patch) | |
| tree | de0525dae8420a56f9a00def631ccc0108d9d091 /net/core/netpoll.c | |
| parent | 4d9fbf539b52810cd2903719b181ed3d3ccd861f (diff) | |
| parent | 26273939ace935dd7553b31d279eab30b40f7b9a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index d3408a693166..912731bed7b7 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -277,7 +277,7 @@ static void zap_completion_queue(void) struct sk_buff *skb = clist; clist = clist->next; if (!skb_irq_freeable(skb)) { - refcount_inc(&skb->users); + refcount_set(&skb->users, 1); dev_kfree_skb_any(skb); /* put this one back */ } else { __kfree_skb(skb); @@ -666,7 +666,7 @@ int netpoll_setup(struct netpoll *np) int err; rtnl_lock(); - if (np->dev_name) { + if (np->dev_name[0]) { struct net *net = current->nsproxy->net_ns; ndev = __dev_get_by_name(net, np->dev_name); } |