diff options
| author | Simon Horman <horms@verge.net.au> | 2014-10-06 12:05:13 (GMT) |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2014-11-06 07:52:33 (GMT) |
| commit | 25cd9ba0abc0749e5cb78e6493c6f6b3311ec6c5 (patch) | |
| tree | fbfb953b27fbdcc27d0a50a6e3444532f51f5ffa /net/core | |
| parent | 59b93b41e7fa71138734a911b11b044340dd16bd (diff) | |
| download | linux-25cd9ba0abc0749e5cb78e6493c6f6b3311ec6c5.tar.xz | |
openvswitch: Add basic MPLS support to kernel
Allow datapath to recognize and extract MPLS labels into flow keys
and execute actions which push, pop, and set labels on packets.
Based heavily on work by Leo Alterman, Ravi K, Isaku Yamahata and Joe Stringer.
Cc: Ravi K <rkerur@gmail.com>
Cc: Leo Alterman <lalterman@nicira.com>
Cc: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 40be481..70bb609 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -118,6 +118,7 @@ #include <linux/if_vlan.h> #include <linux/ip.h> #include <net/ip.h> +#include <net/mpls.h> #include <linux/ipv6.h> #include <linux/in.h> #include <linux/jhash.h> @@ -2530,7 +2531,7 @@ static netdev_features_t net_mpls_features(struct sk_buff *skb, netdev_features_t features, __be16 type) { - if (type == htons(ETH_P_MPLS_UC) || type == htons(ETH_P_MPLS_MC)) + if (eth_p_mpls(type)) features &= skb->dev->mpls_features; return features; |