diff options
| author | Alexander Drozdov <al.drozdov@gmail.com> | 2015-02-20 06:24:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-22 05:00:18 +0100 |
| commit | 3f34b24a732bab9635c4b32823268c37c01b40f0 (patch) | |
| tree | e7e5e79fe8fb4446d7191b745e853ec95444c72b /net/packet | |
| parent | rhashtable: ensure cache line alignment on bucket_table (diff) | |
| download | linux-3f34b24a732bab9635c4b32823268c37c01b40f0.tar.xz linux-3f34b24a732bab9635c4b32823268c37c01b40f0.zip | |
af_packet: allow packets defragmentation not only for hash fanout type
Packets defragmentation was introduced for PACKET_FANOUT_HASH only,
see 7736d33f4262 ("packet: Add pre-defragmentation support for ipv4
fanouts")
It may be useful to have defragmentation enabled regardless of
fanout type. Without that, the AF_PACKET user may have to:
1. Collect fragments from different rings
2. Defragment by itself
Signed-off-by: Alexander Drozdov <al.drozdov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 9c28cec1a083..99fc628f7372 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1349,14 +1349,14 @@ static int packet_rcv_fanout(struct sk_buff *skb, struct net_device *dev, return 0; } + if (fanout_has_flag(f, PACKET_FANOUT_FLAG_DEFRAG)) { + skb = ip_check_defrag(skb, IP_DEFRAG_AF_PACKET); + if (!skb) + return 0; + } switch (f->type) { case PACKET_FANOUT_HASH: default: - if (fanout_has_flag(f, PACKET_FANOUT_FLAG_DEFRAG)) { - skb = ip_check_defrag(skb, IP_DEFRAG_AF_PACKET); - if (!skb) - return 0; - } idx = fanout_demux_hash(f, skb, num); break; case PACKET_FANOUT_LB: |