diff options
| author |   Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2017-01-10 07:47:15 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-10 21:02:42 -0500 |
| commit | a505e58252715bbc18a0ee1abae23615fe2586db (patch) | |
| tree | d816d838641ba1082b2356f4e3a365039e63b14d /net/packet/diag.c | |
| parent | bpf: Make unnecessarily global functions static (diff) | |
| download | linux-dev-a505e58252715bbc18a0ee1abae23615fe2586db.tar.xz linux-dev-a505e58252715bbc18a0ee1abae23615fe2586db.zip | |
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/diag.c')
| -rw-r--r-- | net/packet/diag.c | 3 |
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; |