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

Commit d106e05d authored by Steffen Klassert's avatar Steffen Klassert Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: net: Add a netdev software feature set that defaults to off. 



The previous patch added the NETIF_F_GRO_FRAGLIST feature.
This is a software feature that should default to off.
Current software features default to on, so add a new
feature set that defaults to off.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>

Bug: 167707933
Change-Id: Ie56e82a2b2ba3ebd4fded1d865070ddcd311a26a
(cherry picked from commit 1a3c998f3a27ab6ecf56bdbb17e27e55fd6d47cd)
Signed-off-by: default avatarHyunsoon Kim <h10.kim@samsung.com>
parent e1f9bf07

include/linux/netdev_features.h

+3 −0
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) 
/* changeable features with no special hardware requirements */

#define NETIF_F_SOFT_FEATURES	(NETIF_F_GSO | NETIF_F_GRO)



/* Changeable features with no special hardware requirements that defaults to off. */

#define NETIF_F_SOFT_FEATURES_OFF	NETIF_F_GRO_FRAGLIST



#define NETIF_F_VLAN_FEATURES	(NETIF_F_HW_VLAN_CTAG_FILTER | \

				 NETIF_F_HW_VLAN_CTAG_RX | \

				 NETIF_F_HW_VLAN_CTAG_TX | \

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -9041,7 +9041,7 @@ int register_netdevice(struct net_device *dev) 
	/* Transfer changeable features to wanted_features and enable

	 * software offloads (GSO and GRO).

	 */

	dev->hw_features |= NETIF_F_SOFT_FEATURES;

	dev->hw_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_SOFT_FEATURES_OFF);

	dev->features |= NETIF_F_SOFT_FEATURES;



	if (dev->netdev_ops->ndo_udp_tunnel_add) {