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

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

net: move is_vlan_dev into public header file (v2)

2011-05-25T21:55:23+00:00

Migrate is_vlan_dev() to if_vlan.h so that core networkig can use it

Signed-off-by: Neil Horman 
CC: davem@davemloft.net
CC: bhutchings@solarflare.com
Signed-off-by: David S. Miller

vlan: remove one synchronize_net() call

2011-05-09T18:41:41+00:00

At VLAN dismantle phase, unregister_vlan_dev() makes one
synchronize_net() call after vlan_group_set_device(grp, vlan_id, NULL).

This call can be safely removed because we are calling
unregister_netdevice_queue() to queue device for deletion, and this
process needs at least one rcu grace period to complete.

Signed-off-by: Eric Dumazet 
Cc: Ben Greear 
Cc: Patrick McHardy 
Cc: Paul E. McKenney 
Cc: Jesse Gross 
Cc: Michał Mirosław 
Acked-by: Jesse Gross 
Signed-off-by: David S. Miller

net: Missing 'inline' in vlan-disabled vlan_untag()

2011-04-13T02:27:51+00:00

Reported-by: Stephen Rothwell 
Signed-off-by: David S. Miller

net: vlan: make non-hw-accel rx path similar to hw-accel

2011-04-12T21:15:19+00:00

Now there are 2 paths for rx vlan frames. When rx-vlan-hw-accel is
enabled, skb is untagged by NIC, vlan_tci is set and the skb gets into
vlan code in __netif_receive_skb - vlan_hwaccel_do_receive.

For non-rx-vlan-hw-accel however, tagged skb goes thru whole
__netif_receive_skb, it's untagged in ptype_base hander and reinjected

This incosistency is fixed by this patch. Vlan untagging happens early in
__netif_receive_skb so the rest of code (ptype_all handlers, rx_handlers)
see the skb like it was untagged by hw.

Signed-off-by: Jiri Pirko 

v1->v2:
	remove "inline" from vlan_core.c functions
Signed-off-by: David S. Miller

vlan: Add function to retrieve EtherType from vlan packets.

2010-11-12T20:30:57+00:00

Depending on how a packet is vlan tagged (i.e. hardware accelerated or
not), the encapsulated protocol is stored in different locations.  This
provides a consistent method of accessing that protocol, which is needed
by drivers, security checks, etc.

Signed-off-by: Hao Zheng 
Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller

vlan: Calling vlan_hwaccel_do_receive() is always valid.

2010-10-22T02:59:31+00:00

It is now acceptable to receive vlan tagged packets at any time,
even if CONFIG_VLAN_8021Q is not set.  This means that calling
vlan_hwaccel_do_receive() should not result in BUG() but rather just
behave as if there were no vlan devices configured.

Reported-by: Vladislav Zolotarov 
Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller

vlan: Centralize handling of hardware acceleration.

2010-10-21T08:26:53+00:00

Currently each driver that is capable of vlan hardware acceleration
must be aware of the vlan groups that are configured and then pass
the stripped tag to a specialized receive function.  This is

different from other types of hardware offload in that it places a
significant amount of knowledge in the driver itself rather keeping
it in the networking core.

This makes vlan offloading function more similarly to other forms
of offloading (such as checksum offloading or TSO) by doing the
following:
* On receive, stripped vlans are passed directly to the network
core, without attempting to check for vlan groups or reconstructing
the header if no group
* vlans are made less special by folding the logic into the main
receive routines
* On transmit, the device layer will add the vlan header in software
if the hardware doesn't support it, instead of spreading that logic
out in upper layers, such as bonding.

There are a number of advantages to this:
* Fixes all bugs with drivers incorrectly dropping vlan headers at once.
* Avoids having to disable VLAN acceleration when in promiscuous mode
(good for bridging since it always puts devices in promiscuous mode).
* Keeps VLAN tag separate until given to ultimate consumer, which
avoids needing to do header reconstruction as in tg3 unless absolutely
necessary.
* Consolidates common code in core networking.

Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller

vlan: Avoid hash table lookup to find group.

2010-10-21T08:26:53+00:00

A struct net_device always maps to zero or one vlan groups and we
always know the device when we are looking up a group.  We currently
do a hash table lookup on the device to find the group but it is
much simpler to just store a pointer.

Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller

vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.

2010-10-21T08:26:50+00:00

VLAN_GROUP_ARRAY_LEN is simply the number of possible vlan VIDs.
Since vlan groups will soon be more of an implementation detail
for vlan devices, rename the constant to be descriptive of its
actual purpose.

Signed-off-by: Jesse Gross 
Signed-off-by: David S. Miller