diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:38 -0500 |
| commit | e51a08b8df461919451b1a2bf4a730da0b994425 (patch) | |
| tree | f3db0334e66ecad72af35d47efac4f1a24edb736 /net/core | |
| parent | net: Rearrange loop in net_rx_action (diff) | |
| parent | vxlan: Fix double free of skb. (diff) | |
| download | linux-dev-e51a08b8df461919451b1a2bf4a730da0b994425.tar.xz linux-dev-e51a08b8df461919451b1a2bf4a730da0b994425.zip | |
Merge branch 'openvswitch-net'
Pravin B Shelar says:
====================
openvswitch: datapath fixes
Following patch series is mostly targeted to MPLS fixes. other
patches are related datapth transmit path error handling.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -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) /* If MPLS offload request, verify we are testing hardware MPLS features * instead of standard features for the netdev. */ -#ifdef CONFIG_NET_MPLS_GSO +#if IS_ENABLED(CONFIG_NET_MPLS_GSO) static netdev_features_t net_mpls_features(struct sk_buff *skb, netdev_features_t features, __be16 type) |