Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28d2b136 authored Apr 19, 2013 by Patrick McHardy Committed by David S. Miller Apr 19, 2013

net: vlan: announce STAG offload capability in some drivers



- macvlan: propagate STAG filtering capabilities from underlying device
- ifb: announce STAG tagging support in addition to CTAG tagging support
- veth: announce STAG tagging/stripping support in addition to CTAG support

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8ad227ff

drivers/net/ifb.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -166,7 +166,8 @@ static const struct net_device_ops ifb_netdev_ops = {

	#define IFB_FEATURES (NETIF_F_HW_CSUM \| NETIF_F_SG \| NETIF_F_FRAGLIST \| \		#define IFB_FEATURES (NETIF_F_HW_CSUM \| NETIF_F_SG \| NETIF_F_FRAGLIST \| \
	NETIF_F_TSO_ECN \| NETIF_F_TSO \| NETIF_F_TSO6 \| \		NETIF_F_TSO_ECN \| NETIF_F_TSO \| NETIF_F_TSO6 \| \
	NETIF_F_HIGHDMA \| NETIF_F_HW_VLAN_CTAG_TX)		NETIF_F_HIGHDMA \| NETIF_F_HW_VLAN_CTAG_TX \| \
			NETIF_F_HW_VLAN_STAG_TX)

	static void ifb_setup(struct net_device *dev)		static void ifb_setup(struct net_device *dev)
	{		{

drivers/net/macvlan.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -471,7 +471,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;
	(NETIF_F_SG \| NETIF_F_ALL_CSUM \| NETIF_F_HIGHDMA \| NETIF_F_FRAGLIST \| \		(NETIF_F_SG \| NETIF_F_ALL_CSUM \| NETIF_F_HIGHDMA \| NETIF_F_FRAGLIST \| \
	NETIF_F_GSO \| NETIF_F_TSO \| NETIF_F_UFO \| NETIF_F_GSO_ROBUST \| \		NETIF_F_GSO \| NETIF_F_TSO \| NETIF_F_UFO \| NETIF_F_GSO_ROBUST \| \
	NETIF_F_TSO_ECN \| NETIF_F_TSO6 \| NETIF_F_GRO \| NETIF_F_RXCSUM \| \		NETIF_F_TSO_ECN \| NETIF_F_TSO6 \| NETIF_F_GRO \| NETIF_F_RXCSUM \| \
	NETIF_F_HW_VLAN_CTAG_FILTER)		NETIF_F_HW_VLAN_CTAG_FILTER \| NETIF_F_HW_VLAN_STAG_FILTER)

	#define MACVLAN_STATE_MASK \		#define MACVLAN_STATE_MASK \
	((1<<__LINK_STATE_NOCARRIER) \| (1<<__LINK_STATE_DORMANT))		((1<<__LINK_STATE_NOCARRIER) \| (1<<__LINK_STATE_DORMANT))

drivers/net/veth.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -255,7 +255,8 @@ static const struct net_device_ops veth_netdev_ops = {

	#define VETH_FEATURES (NETIF_F_SG \| NETIF_F_FRAGLIST \| NETIF_F_ALL_TSO \| \		#define VETH_FEATURES (NETIF_F_SG \| NETIF_F_FRAGLIST \| NETIF_F_ALL_TSO \| \
	NETIF_F_HW_CSUM \| NETIF_F_RXCSUM \| NETIF_F_HIGHDMA \| \		NETIF_F_HW_CSUM \| NETIF_F_RXCSUM \| NETIF_F_HIGHDMA \| \
	NETIF_F_HW_VLAN_CTAG_TX \| NETIF_F_HW_VLAN_CTAG_RX)		NETIF_F_HW_VLAN_CTAG_TX \| NETIF_F_HW_VLAN_CTAG_RX \| \
			NETIF_F_HW_VLAN_STAG_TX \| NETIF_F_HW_VLAN_STAG_RX )

	static void veth_setup(struct net_device *dev)		static void veth_setup(struct net_device *dev)
	{		{