]> www.infradead.org Git - users/jedix/linux-maple.git/commit
vlan: allow nested vlan_do_receive()
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 30 Mar 2012 23:52:48 +0000 (16:52 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 30 Mar 2012 23:52:48 +0000 (16:52 -0700)
commitdf641fddb1760781bbe7e9ce0f012bf0db06f862
tree3f3e85324607c3d3b35d9f3373336677e6934794
parente1b39714d85afdbfa5628cae86b79d8ddc1dc107
vlan: allow nested vlan_do_receive()

commit 2425717b27eb (net: allow vlan traffic to be received under bond)
broke ARP processing on vlan on top of bonding.

       +-------+
eth0 --| bond0 |---bond0.103
eth1 --|       |
       +-------+

52870.115435: skb_gro_reset_offset <-napi_gro_receive
52870.115435: dev_gro_receive <-napi_gro_receive
52870.115435: napi_skb_finish <-napi_gro_receive
52870.115435: netif_receive_skb <-napi_skb_finish
52870.115435: get_rps_cpu <-netif_receive_skb
52870.115435: __netif_receive_skb <-netif_receive_skb
52870.115436: vlan_do_receive <-__netif_receive_skb
52870.115436: bond_handle_frame <-__netif_receive_skb
52870.115436: vlan_do_receive <-__netif_receive_skb
52870.115436: arp_rcv <-__netif_receive_skb
52870.115436: kfree_skb <-arp_rcv

Packet is dropped in arp_rcv() because its pkt_type was set to
PACKET_OTHERHOST in the first vlan_do_receive() call, since no eth0.103
exists.

We really need to change pkt_type only if no more rx_handler is about to
be called for the packet.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:

include/linux/if_vlan.h
include/linux/if_vlan.h
net/8021q/vlan_core.c
net/core/dev.c