aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2014-11-05 15:27:48 -0800
committerPravin B Shelar <pshelar@nicira.com>2014-11-05 23:52:33 -0800
commit59b93b41e7fa71138734a911b11b044340dd16bd (patch)
tree7d5680f8c3eba5ce40a04b6115b41550c9d140f5 /net/core
parentfou: Fix typo in returning flags in netlink (diff)
downloadlinux-dev-59b93b41e7fa71138734a911b11b044340dd16bd.tar.xz
linux-dev-59b93b41e7fa71138734a911b11b044340dd16bd.zip
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: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/ethtool.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 06dfb293e5aa..b0f84f5ddda8 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -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",