Commit 59b93b41 authored by Pravin B Shelar's avatar Pravin B Shelar
Browse files

net: Remove MPLS GSO feature. 



Device can export MPLS GSO support in dev->mpls_features same way
it export vlan features in dev->vlan_features. So it is safe to
remove NETIF_F_GSO_MPLS redundant flag.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
parent e1b2cb65

include/linux/netdev_features.h

+1 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ enum { 
	NETIF_F_GSO_SIT_BIT,		/* ... SIT tunnel with TSO */

	NETIF_F_GSO_UDP_TUNNEL_BIT,	/* ... UDP TUNNEL with TSO */

	NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT,/* ... UDP TUNNEL with TSO & CSUM */

	NETIF_F_GSO_MPLS_BIT,		/* ... MPLS segmentation */

	NETIF_F_GSO_TUNNEL_REMCSUM_BIT, /* ... TUNNEL with TSO & REMCSUM */

	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */

		NETIF_F_GSO_TUNNEL_REMCSUM_BIT,
@@ -119,7 +118,6 @@ enum { 
#define NETIF_F_GSO_SIT		__NETIF_F(GSO_SIT)

#define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL)

#define NETIF_F_GSO_UDP_TUNNEL_CSUM __NETIF_F(GSO_UDP_TUNNEL_CSUM)

#define NETIF_F_GSO_MPLS	__NETIF_F(GSO_MPLS)

#define NETIF_F_GSO_TUNNEL_REMCSUM __NETIF_F(GSO_TUNNEL_REMCSUM)

#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)
@@ -183,7 +181,6 @@ enum { 
				 NETIF_F_GSO_IPIP |			\

				 NETIF_F_GSO_SIT |			\

				 NETIF_F_GSO_UDP_TUNNEL |		\

				 NETIF_F_GSO_UDP_TUNNEL_CSUM |		\

				 NETIF_F_GSO_MPLS)

				 NETIF_F_GSO_UDP_TUNNEL_CSUM)



#endif	/* _LINUX_NETDEV_FEATURES_H */

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -3583,7 +3583,6 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_SIT     != (NETIF_F_GSO_SIT >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL != (NETIF_F_GSO_UDP_TUNNEL >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL_CSUM != (NETIF_F_GSO_UDP_TUNNEL_CSUM >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_MPLS    != (NETIF_F_GSO_MPLS >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_TUNNEL_REMCSUM != (NETIF_F_GSO_TUNNEL_REMCSUM >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

include/linux/skbuff.h

+1 −3
Original line number Diff line number Diff line
@@ -372,9 +372,7 @@ enum { 


	SKB_GSO_UDP_TUNNEL_CSUM = 1 << 11,



	SKB_GSO_MPLS = 1 << 12,



	SKB_GSO_TUNNEL_REMCSUM = 1 << 13,

	SKB_GSO_TUNNEL_REMCSUM = 1 << 12,

};



#if BITS_PER_LONG > 32

net/core/ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] 
	[NETIF_F_GSO_IPIP_BIT] =	 "tx-ipip-segmentation",

	[NETIF_F_GSO_SIT_BIT] =		 "tx-sit-segmentation",

	[NETIF_F_GSO_UDP_TUNNEL_BIT] =	 "tx-udp_tnl-segmentation",

	[NETIF_F_GSO_MPLS_BIT] =	 "tx-mpls-segmentation",



	[NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",

	[NETIF_F_SCTP_CSUM_BIT] =        "tx-checksum-sctp",

net/ipv4/af_inet.c

+0 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,6 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
		       SKB_GSO_UDP_TUNNEL |

		       SKB_GSO_UDP_TUNNEL_CSUM |

		       SKB_GSO_TUNNEL_REMCSUM |

		       SKB_GSO_MPLS |

		       0)))

		goto out;