linux-toradex.git/include/linux/if_vlan.h, branch v3.2.59

vlan: don't deliver frames for unknown vlans to protocols

2012-10-30T23:26:34+00:00

[ Upstream commit 48cc32d38a52d0b68f91a171a8d00531edc6a46e ]

6a32e4f9dd9219261f8856f817e6655114cfec2f made the vlan code skip marking
vlan-tagged frames for not locally configured vlans as PACKET_OTHERHOST if
there was an rx_handler, as the rx_handler could cause the frame to be received
on a different (virtual) vlan-capable interface where that vlan might be
configured.

As rx_handlers do not necessarily return RX_HANDLER_ANOTHER, this could cause
frames for unknown vlans to be delivered to the protocol stack as if they had
been received untagged.

For example, if an ipv6 router advertisement that's tagged for a locally not
configured vlan is received on an interface with macvlan interfaces attached,
macvlan's rx_handler returns RX_HANDLER_PASS after delivering the frame to the
macvlan interfaces, which caused it to be passed to the protocol stack, leading
to ipv6 addresses for the announced prefix being configured even though those
are completely unusable on the underlying interface.

The fix moves marking as PACKET_OTHERHOST after the rx_handler so the
rx_handler, if there is one, sees the frame unchanged, but afterwards,
before the frame is delivered to the protocol stack, it gets marked whether
there is an rx_handler or not.

Signed-off-by: Florian Zumbiehl 
Signed-off-by: David S. Miller 
Signed-off-by: Ben Hutchings

vlan: allow nested vlan_do_receive()

2011-10-30T08:43:30+00:00

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 
Reviewed-by: Jiri Pirko 
Signed-off-by: David S. Miller

vlan: move vlan_group_[gs]et_device to public header

2011-07-21T20:47:58+00:00

there are no users outside vlan code

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

vlan: kill vlan_gro_frags and vlan_gro_receive

2011-07-21T20:47:57+00:00

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

vlan: kill __vlan_hwaccel_rx and vlan_hwaccel_rx

2011-07-21T20:47:56+00:00

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

vlan: kill vlan_hwaccel_receive_skb

2011-07-21T20:47:56+00:00

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

vlan: introduce __vlan_find_dev_deep()

2011-07-21T20:47:53+00:00

Since vlan_group_get_device and vlan_group is not going to be accessible
from device drivers, introduce function which substitutes it.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

vlan: finish removing vlan_find_dev from public header

2011-07-21T20:47:53+00:00

else case remained forgotten.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

net: vlan, qlcnic: make vlan_find_dev private

2011-07-17T19:33:22+00:00

there is only one user of vlan_find_dev outside of the actual vlan code:
qlcnic uses it to iterate over some VLANs it knows.

let's just make vlan_find_dev private to the VLAN code and have the
iteration in qlcnic be a bit more direct. (a few rcu dereferences less
too)

Signed-off-by: David Lamparter 
Cc: Patrick McHardy 
Cc: Amit Kumar Salecha 
Cc: Anirban Chakraborty 
Cc: linux-driver@qlogic.com
Signed-off-by: David S. Miller

vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check

2011-06-11T23:15:50+00:00

Testing of VLAN_FLAG_REORDER_HDR does not belong in vlan_untag
but rather in vlan_do_receive.  Otherwise the vlan header
will not be properly put on the packet in the case of
vlan header accelleration.

As we remove the check from vlan_check_reorder_header
rename it vlan_reorder_header to keep the naming clean.

Fix up the skb->pkt_type early so we don't look at the packet
after adding the vlan tag, which guarantees we don't goof
and look at the wrong field.

Use a simple if statement instead of a complicated switch
statement to decided that we need to increment rx_stats
for a multicast packet.

Hopefully at somepoint we will just declare the case where
VLAN_FLAG_REORDER_HDR is cleared as unsupported and remove
the code.  Until then this keeps it working correctly.

Signed-off-by: Eric W. Biederman 
Signed-off-by: Jiri Pirko 
Acked-by: Changli Gao 
Signed-off-by: David S. Miller