diff options
Diffstat (limited to 'include/linux/netdev_features.h')
| -rw-r--r-- | include/linux/netdev_features.h | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index cbaa027ef5a..09906b7ca47 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -25,9 +25,6 @@ enum {  	NETIF_F_HW_VLAN_CTAG_TX_BIT,	/* Transmit VLAN CTAG HW acceleration */  	NETIF_F_HW_VLAN_CTAG_RX_BIT,	/* Receive VLAN CTAG HW acceleration */  	NETIF_F_HW_VLAN_CTAG_FILTER_BIT,/* Receive filtering on VLAN CTAGs */ -	NETIF_F_HW_VLAN_STAG_TX_BIT,	/* Transmit VLAN STAG HW acceleration */ -	NETIF_F_HW_VLAN_STAG_RX_BIT,	/* Receive VLAN STAG HW acceleration */ -	NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */  	NETIF_F_VLAN_CHALLENGED_BIT,	/* Device cannot handle VLAN packets */  	NETIF_F_GSO_BIT,		/* Enable software GSO. */  	NETIF_F_LLTX_BIT,		/* LockLess TX - deprecated. Please */ @@ -59,6 +56,9 @@ enum {  	NETIF_F_LOOPBACK_BIT,		/* Enable loopback */  	NETIF_F_RXFCS_BIT,		/* Append FCS to skb pkt data */  	NETIF_F_RXALL_BIT,		/* Receive errored frames too */ +	NETIF_F_HW_VLAN_STAG_TX_BIT,	/* Transmit VLAN STAG HW acceleration */ +	NETIF_F_HW_VLAN_STAG_RX_BIT,	/* Receive VLAN STAG HW acceleration */ +	NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */  	/*  	 * Add your fresh new feature above and remember to update @@ -86,9 +86,6 @@ enum {  #define NETIF_F_HW_VLAN_CTAG_FILTER __NETIF_F(HW_VLAN_CTAG_FILTER)  #define NETIF_F_HW_VLAN_CTAG_RX	__NETIF_F(HW_VLAN_CTAG_RX)  #define NETIF_F_HW_VLAN_CTAG_TX	__NETIF_F(HW_VLAN_CTAG_TX) -#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER) -#define NETIF_F_HW_VLAN_STAG_RX	__NETIF_F(HW_VLAN_STAG_RX) -#define NETIF_F_HW_VLAN_STAG_TX	__NETIF_F(HW_VLAN_STAG_TX)  #define NETIF_F_IP_CSUM		__NETIF_F(IP_CSUM)  #define NETIF_F_IPV6_CSUM	__NETIF_F(IPV6_CSUM)  #define NETIF_F_LLTX		__NETIF_F(LLTX) @@ -110,6 +107,9 @@ enum {  #define NETIF_F_RXALL		__NETIF_F(RXALL)  #define NETIF_F_GSO_GRE		__NETIF_F(GSO_GRE)  #define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL) +#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER) +#define NETIF_F_HW_VLAN_STAG_RX	__NETIF_F(HW_VLAN_STAG_RX) +#define NETIF_F_HW_VLAN_STAG_TX	__NETIF_F(HW_VLAN_STAG_TX)  /* Features valid for ethtool to change */  /* = all defined minus driver/device-class-related */  |