summaryrefslogtreecommitdiff
path: root/net/packet
diff options
context:
space:
mode:
authorSowmini Varadhan <sowmini.varadhan@oracle.com>2017-01-10 18:47:15 +0300
committerDavid S. Miller <davem@davemloft.net>2017-01-11 05:02:42 +0300
commita505e58252715bbc18a0ee1abae23615fe2586db (patch)
treed816d838641ba1082b2356f4e3a365039e63b14d /net/packet
parent3bf003335ba356aac5a43e28640159d4ae8a2a60 (diff)
downloadlinux-a505e58252715bbc18a0ee1abae23615fe2586db.tar.xz
packet: pdiag_put_ring() should return TX_RING info for TPACKET_V3
Commit 7f953ab2ba46 ("af_packet: TX_RING support for TPACKET_V3") now makes it possible to use TX_RING with TPACKET_V3, so make the the relevant information available via 'ss -e -a --packet' Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/diag.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/packet/diag.c b/net/packet/diag.c
index 0ed68f0238bf..7ef1c881ae74 100644
--- 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;