From: David S. Miller Date: Tue, 4 Mar 2014 18:51:13 +0000 (-0500) Subject: Merge branch 'mpls_tc' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9e82e7f4af0ad90ab41b4ae80ce42b20df20c725;p=deliverable%2Flinux.git 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 --- 9e82e7f4af0ad90ab41b4ae80ce42b20df20c725