From e774c3e458bdf60e5b242d832485604b14b1a324 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Sat, 29 Mar 2014 22:05:11 +0000 Subject: [PATCH] backports: backport MPLS support This simply the files that define the structures and defines used to decode MPLS on the skb. For an example usage see 960d97f95. The headers were added first via f3baa393ff. commit f3baa393ffc9a7aefc0bf767729382085e81f606 Author: Simon Wunderlich Date: Mon Mar 3 17:23:11 2014 +0100 UAPI: add MPLS label stack definition Labels for the Multiprotocol Label Switching are defined in RFC 3032 which was superseded by RFC 5462. Add the definition to UAPI and a stub header for include/linux. Signed-off-by: Simon Wunderlich Signed-off-by: Mathias Kretschmer Signed-off-by: David S. Miller commit 960d97f9518ef6fb8ff87450d6b0c88ce5df9532 Author: Simon Wunderlich Date: Mon Mar 3 17:23:12 2014 +0100 cfg80211: add MPLS and 802.21 classification MPLS labels may contain traffic control information, which should be evaluated and used by the wireless subsystem if present. Also check for IEEE 802.21 which is always network control traffic. Signed-off-by: Simon Wunderlich Signed-off-by: Mathias Kretschmer Acked-by: Johannes Berg Signed-off-by: David S. Miller Signed-off-by: Luis R. Rodriguez --- copy-list | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/copy-list b/copy-list index bde95a1a042f..bec17a57be31 100644 --- a/copy-list +++ b/copy-list @@ -191,3 +191,9 @@ include/linux/spi/at86rf230.h net/ieee802154/ net/mac802154/ drivers/net/ieee802154/ + +# MPLS labels, checked on skb->protocol on the +# respective 802 family, only ethernet seems to use +# this right now, see 960d97f95 +include/linux/mpls.h +include/uapi/linux/mpls.h -- 2.30.2