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

Commit 7889cbee authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

switchdev: remove NETIF_F_HW_SWITCH_OFFLOAD feature flag 



Roopa said remove the feature flag for this series and she'll work on
bringing it back if needed at a later date.

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58c2cb16

drivers/net/bonding/bond_main.c

+1 −4
Original line number Diff line number Diff line
@@ -1015,10 +1015,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev, 
	netdev_features_t mask;

	struct slave *slave;



	/* If any slave has the offload feature flag set,

	 * set the offload flag on the bond.

	 */

	mask = features | NETIF_F_HW_SWITCH_OFFLOAD;

	mask = features;



	features &= ~NETIF_F_ONE_FOR_ALL;

	features |= NETIF_F_ALL_FOR_ALL;

drivers/net/ethernet/rocker/rocker.c

+1 −2
Original line number Diff line number Diff line
@@ -4906,8 +4906,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) 
	rocker_carrier_init(rocker_port);



	dev->features |= NETIF_F_NETNS_LOCAL |

			 NETIF_F_HW_VLAN_CTAG_FILTER |

			 NETIF_F_HW_SWITCH_OFFLOAD;

			 NETIF_F_HW_VLAN_CTAG_FILTER;



	err = register_netdev(dev);

	if (err) {

drivers/net/team/team.c

+1 −1
Original line number Diff line number Diff line
@@ -1924,7 +1924,7 @@ static netdev_features_t team_fix_features(struct net_device *dev, 
	struct team *team = netdev_priv(dev);

	netdev_features_t mask;



	mask = features | NETIF_F_HW_SWITCH_OFFLOAD;

	mask = features;

	features &= ~NETIF_F_ONE_FOR_ALL;

	features |= NETIF_F_ALL_FOR_ALL;

include/linux/netdev_features.h

+1 −4
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ enum { 
	NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */

	NETIF_F_HW_L2FW_DOFFLOAD_BIT,	/* Allow L2 Forwarding in Hardware */

	NETIF_F_BUSY_POLL_BIT,		/* Busy poll */

	NETIF_F_HW_SWITCH_OFFLOAD_BIT,  /* HW switch offload */



	/*

	 * Add your fresh new feature above and remember to update
@@ -125,7 +124,6 @@ enum { 
#define NETIF_F_HW_VLAN_STAG_TX	__NETIF_F(HW_VLAN_STAG_TX)

#define NETIF_F_HW_L2FW_DOFFLOAD	__NETIF_F(HW_L2FW_DOFFLOAD)

#define NETIF_F_BUSY_POLL	__NETIF_F(BUSY_POLL)

#define NETIF_F_HW_SWITCH_OFFLOAD	__NETIF_F(HW_SWITCH_OFFLOAD)



/* Features valid for ethtool to change */

/* = all defined minus driver/device-class-related */
@@ -161,8 +159,7 @@ enum { 
 */

#define NETIF_F_ONE_FOR_ALL	(NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \

				 NETIF_F_SG | NETIF_F_HIGHDMA |		\

				 NETIF_F_FRAGLIST | NETIF_F_VLAN_CHALLENGED | \

				 NETIF_F_HW_SWITCH_OFFLOAD)

				 NETIF_F_FRAGLIST | NETIF_F_VLAN_CHALLENGED)



/*

 * If one device doesn't support one of these features, then disable it

net/core/ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] 
	[NETIF_F_RXALL_BIT] =            "rx-all",

	[NETIF_F_HW_L2FW_DOFFLOAD_BIT] = "l2-fwd-offload",

	[NETIF_F_BUSY_POLL_BIT] =        "busy-poll",

	[NETIF_F_HW_SWITCH_OFFLOAD_BIT] = "hw-switch-offload",

};



static const char