diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-21 19:32:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-21 19:32:58 +0100 |
| commit | 6329b1bb4e691b24e51ea940b3c2cffd402bd5f8 (patch) | |
| tree | 1e01171ec074d83637f3249a64c179b2147e8e4b /net/core/netpoll.c | |
| parent | 702992387b759828f58e52f660acb284b3069944 (diff) | |
| parent | 14ccee78fc82f5512908f4424f541549a5705b89 (diff) | |
| download | linux-6329b1bb4e691b24e51ea940b3c2cffd402bd5f8.tar.bz2 | |
Merge tag 'v4.13-rc6' into asoc-msm8916
Linux 4.13-rc6
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); } |