diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-03-04 13:51:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-04 13:51:13 -0500 |
| commit | 9e82e7f4af0ad90ab41b4ae80ce42b20df20c725 (patch) | |
| tree | e91b718ac33eecdf83271c01c93d20974b70ce67 /net/key | |
| parent | tcp: snmp stats for Fast Open, SYN rtx, and data pkts (diff) | |
| parent | cfg80211: add MPLS and 802.21 classification (diff) | |
| download | linux-dev-9e82e7f4af0ad90ab41b4ae80ce42b20df20c725.tar.xz linux-dev-9e82e7f4af0ad90ab41b4ae80ce42b20df20c725.zip | |
Merge branch 'mpls_tc'
Simon Wunderlich says:
====================
this series contains a header file proposal for MPLS labels. These
labels do not seem to be properly defined in the kernel so far. We are
developing a wired/wireless 802.21/MPLS switch and need to check the
MPLS labels to use the traffic control info for transmissions over
802.11 networks.
Changes to third version:
* rename mpls_label_stack to mpls_label (thanks Neil)
* fix over-indendented closing brac (thanks Sergei)
* add Johannes' Ack
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions