diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-02 23:34:27 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:23:54 -0700 |
| commit | f164ea0ffac00bedfe0eedc1757d644c397c6ab2 (patch) | |
| tree | 6be4cfb3995abffd8e7a76ff4d0ec88856d7f992 | |
| parent | 414a0d9d48df6b840aee9337255219e0d184e829 (diff) | |
Revert "backports: backport MPLS support"
This didn't make it to 3.14.
This reverts commit 613e96fc16ea67033854d967a709288bda2e8a46.
| -rw-r--r-- | copy-list | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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 |