diff options
author | Pravin B Shelar <pshelar@nicira.com> | 2014-12-23 19:20:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:30 -0500 |
commit | d0edc7bf397a5e0f312bf8a1e87cfee0019dc07b (patch) | |
tree | 67e893422297b3079ec028a4841dde6c9711a978 /net/core/dev.c | |
parent | ceb8d5bf17d366534f32d2f60f41d905a5bc864b (diff) |
mpls: Fix config check for mpls.
Fixes MPLS GSO for case when mpls is compiled as kernel module.
Fixes: 0d89d2035f ("MPLS: Add limited GSO support").
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index c97ae6fec040..67b6210a589a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2522,7 +2522,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) | |||
2522 | /* If MPLS offload request, verify we are testing hardware MPLS features | 2522 | /* If MPLS offload request, verify we are testing hardware MPLS features |
2523 | * instead of standard features for the netdev. | 2523 | * instead of standard features for the netdev. |
2524 | */ | 2524 | */ |
2525 | #ifdef CONFIG_NET_MPLS_GSO | 2525 | #if IS_ENABLED(CONFIG_NET_MPLS_GSO) |
2526 | static netdev_features_t net_mpls_features(struct sk_buff *skb, | 2526 | static netdev_features_t net_mpls_features(struct sk_buff *skb, |
2527 | netdev_features_t features, | 2527 | netdev_features_t features, |
2528 | __be16 type) | 2528 | __be16 type) |