From f164ea0ffac00bedfe0eedc1757d644c397c6ab2 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 2 Apr 2014 23:34:27 +0000 Subject: Revert "backports: backport MPLS support" This didn't make it to 3.14. This reverts commit 613e96fc16ea67033854d967a709288bda2e8a46. --- copy-list | 6 ------ 1 file changed, 6 deletions(-) diff --git a/copy-list b/copy-list index bec17a57..bde95a1a 100644 --- a/copy-list +++ b/copy-list @@ -191,9 +191,3 @@ 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 -- cgit v1.2.3