Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

[karo-tx-linux.git] / net / packet / diag.c

diff --git a/net/packet/diag.c b/net/packet/diag.c
index 0ed68f0238bf9416f1cc92928b61a385a1055886..7ef1c881ae7417e500630df398a900dddd598092 100644 (file)
--- a/net/packet/diag.c
+++ b/net/packet/diag.c
@@ -73,8 +73,7 @@ static int pdiag_put_ring(struct packet_ring_buffer *ring, int ver, int nl_type,
 {
        struct packet_diag_ring pdr;
 
-       if (!ring->pg_vec || ((ver > TPACKET_V2) &&
-                               (nl_type == PACKET_DIAG_TX_RING)))
+       if (!ring->pg_vec)
                return 0;
 
        pdr.pdr_block_size = ring->pg_vec_pages << PAGE_SHIFT;