History

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.

Steffen Klassert committed 6 years ago

Commit 1a3c9981 parent 3b335832 files · +4 −1Browse files

Unified · Split

2 files
  1. include/linux/netdev_features.h +3 −0
  2. net/core/dev.c +1 −1
include/linux/netdev_features.h+3−0
@@ -230,6 +230,9 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) · 229 unmodified lines
230/* changeable features with no special hardware requirements */230/* changeable features with no special hardware requirements */
231#define NETIF_F_SOFT_FEATURES (NETIF_F_GSO | NETIF_F_GRO)231#define NETIF_F_SOFT_FEATURES (NETIF_F_GSO | NETIF_F_GRO)
232 232
233/* Changeable features with no special hardware requirements that defaults to off. */
234#define NETIF_F_SOFT_FEATURES_OFF NETIF_F_GRO_FRAGLIST
235
233#define NETIF_F_VLAN_FEATURES (NETIF_F_HW_VLAN_CTAG_FILTER | \236#define NETIF_F_VLAN_FEATURES (NETIF_F_HW_VLAN_CTAG_FILTER | \
234 NETIF_F_HW_VLAN_CTAG_RX | \237 NETIF_F_HW_VLAN_CTAG_RX | \
235 NETIF_F_HW_VLAN_CTAG_TX | \238 NETIF_F_HW_VLAN_CTAG_TX | \
net/core/dev.c+1−1
@@ -9283,7 +9283,7 @@ int register_netdevice(struct net_device *dev) · 9282 unmodified lines
9283 /* Transfer changeable features to wanted_features and enable9283 /* Transfer changeable features to wanted_features and enable
9284 * software offloads (GSO and GRO).9284 * software offloads (GSO and GRO).
9285 */9285 */
9286 dev->hw_features |= NETIF_F_SOFT_FEATURES;9286 dev->hw_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_SOFT_FEATURES_OFF);
9287 dev->features |= NETIF_F_SOFT_FEATURES;9287 dev->features |= NETIF_F_SOFT_FEATURES;
9288 9288
9289 if (dev->netdev_ops->ndo_udp_tunnel_add) {9289 if (dev->netdev_ops->ndo_udp_tunnel_add) {