linux-toradex.git/include/linux/if_vlan.h, branch v4.1.1

net: Move check for multiple vlans to drivers

2015-03-29T20:33:22+00:00

To allow drivers to handle the features check for multiple tags,
move the check to ndo_features_check().
As no drivers currently handle multiple tagged TSO, introduce
dflt_features_check() and call it if the driver does not have
ndo_features_check().

Signed-off-by: Toshiaki Makita 
Signed-off-by: David S. Miller

vlan: Introduce helper functions to check if skb is tagged

2015-03-29T20:33:22+00:00

Separate the two checks for single vlan and multiple vlans in
netif_skb_features().  This allows us to move the check for multiple
vlans to another function later.

Signed-off-by: Toshiaki Makita 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-02-05T22:33:28+00:00

Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: David S. Miller

net: Fix vlan_get_protocol for stacked vlan

2015-01-31T02:03:47+00:00

vlan_get_protocol() could not get network protocol if a skb has a 802.1ad
vlan tag or multiple vlans, which caused incorrect checksum calculation
in several drivers.

Fix vlan_get_protocol() to retrieve network protocol instead of incorrect
vlan protocol.

As the logic is the same as skb_network_protocol(), create a common helper
function __vlan_get_protocol() and call it from existing functions.

Signed-off-by: Toshiaki Makita 
Signed-off-by: David S. Miller

net: rename vlan_tx_* helpers since "tx" is misleading there

2015-01-13T22:51:08+00:00

The same macros are used for rx as well. So rename it.

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

vlan: introduce __vlan_insert_tag helper which does not free skb

2014-11-21T19:20:17+00:00

There's a need for helper which inserts vlan tag but does not free the
skb in case of an error.

Suggested-by: Pravin Shelar 
Signed-off-by: Jiri Pirko 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

vlan: introduce *vlan_hwaccel_push_inside helpers

2014-11-21T19:20:17+00:00

Use them to push skb->vlan_tci into the payload and avoid code
duplication.

Signed-off-by: Jiri Pirko 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

2014-11-21T19:20:17+00:00

Name fits better. Plus there's going to be introduced
__vlan_insert_tag later on.

Signed-off-by: Jiri Pirko 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

vlan: kill vlan_put_tag helper

2014-11-21T19:20:17+00:00

Since both tx and rx paths work with skb->vlan_tci, there's no need for
this function anymore. Switch users directly to __vlan_hwaccel_put_tag.

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

vlan: make __vlan_hwaccel_put_tag return void

2014-11-21T19:20:16+00:00

Always returns the same skb it gets, so change to void.

Signed-off-by: Jiri Pirko 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller