diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-01 19:07:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 19:07:50 +0200 |
| commit | 29fda25a2d31098044f8dfa177c4d2834071828e (patch) | |
| tree | 9e4be11c49a4405c19ece8f81fbb1db478da1055 /net/packet | |
| parent | Merge branch 'revert-ipv6-const' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-29fda25a2d31098044f8dfa177c4d2834071828e.tar.xz linux-29fda25a2d31098044f8dfa177c4d2834071828e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index e7303f68972d..5a178047a7ce 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4327,7 +4327,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, register_prot_hook(sk); } spin_unlock(&po->bind_lock); - if (closing && (po->tp_version > TPACKET_V2)) { + if (pg_vec && (po->tp_version > TPACKET_V2)) { /* Because we don't support block-based V3 on tx-ring */ if (!tx_ring) prb_shutdown_retire_blk_timer(po, rb_queue); |