diff options
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ecbe419e05ab..a3d13f5e2bfc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -8215,7 +8215,7 @@ static netdev_features_t netdev_sync_upper_features(struct net_device *lower, | |||
| 8215 | netdev_features_t feature; | 8215 | netdev_features_t feature; |
| 8216 | int feature_bit; | 8216 | int feature_bit; |
| 8217 | 8217 | ||
| 8218 | for_each_netdev_feature(&upper_disables, feature_bit) { | 8218 | for_each_netdev_feature(upper_disables, feature_bit) { |
| 8219 | feature = __NETIF_F_BIT(feature_bit); | 8219 | feature = __NETIF_F_BIT(feature_bit); |
| 8220 | if (!(upper->wanted_features & feature) | 8220 | if (!(upper->wanted_features & feature) |
| 8221 | && (features & feature)) { | 8221 | && (features & feature)) { |
| @@ -8235,7 +8235,7 @@ static void netdev_sync_lower_features(struct net_device *upper, | |||
| 8235 | netdev_features_t feature; | 8235 | netdev_features_t feature; |
| 8236 | int feature_bit; | 8236 | int feature_bit; |
| 8237 | 8237 | ||
| 8238 | for_each_netdev_feature(&upper_disables, feature_bit) { | 8238 | for_each_netdev_feature(upper_disables, feature_bit) { |
| 8239 | feature = __NETIF_F_BIT(feature_bit); | 8239 | feature = __NETIF_F_BIT(feature_bit); |
| 8240 | if (!(features & feature) && (lower->features & feature)) { | 8240 | if (!(features & feature) && (lower->features & feature)) { |
| 8241 | netdev_dbg(upper, "Disabling feature %pNF on lower dev %s.\n", | 8241 | netdev_dbg(upper, "Disabling feature %pNF on lower dev %s.\n", |