Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e82e7f4 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents f19c29e3 960d97f9

include/linux/mpls.h

0 → 100644
+6 −0
Original line number Original line Diff line number Diff line 
#ifndef _LINUX_MPLS_H

#define _LINUX_MPLS_H



#include <uapi/linux/mpls.h>



#endif  /* _LINUX_MPLS_H */

include/uapi/linux/if_ether.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ 
#define ETH_P_FCOE	0x8906		/* Fibre Channel over Ethernet  */

#define ETH_P_FCOE	0x8906		/* Fibre Channel over Ethernet  */

#define ETH_P_TDLS	0x890D          /* TDLS */

#define ETH_P_TDLS	0x890D          /* TDLS */

#define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */

#define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */

#define ETH_P_80221	0x8917		/* IEEE 802.21 Media Independent Handover Protocol */

#define ETH_P_QINQ1	0x9100		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

#define ETH_P_QINQ1	0x9100		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

#define ETH_P_QINQ2	0x9200		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

#define ETH_P_QINQ2	0x9200		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

#define ETH_P_QINQ3	0x9300		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

#define ETH_P_QINQ3	0x9300		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

include/uapi/linux/mpls.h

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
#ifndef _UAPI_MPLS_H

#define _UAPI_MPLS_H



#include <linux/types.h>

#include <asm/byteorder.h>



/* Reference: RFC 5462, RFC 3032

 *

 *  0                   1                   2                   3

 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                Label                  | TC  |S|       TTL     |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *

 *	Label:  Label Value, 20 bits

 *	TC:     Traffic Class field, 3 bits

 *	S:      Bottom of Stack, 1 bit

 *	TTL:    Time to Live, 8 bits

 */



struct mpls_label {

	__be32 entry;

};



#define MPLS_LS_LABEL_MASK      0xFFFFF000

#define MPLS_LS_LABEL_SHIFT     12

#define MPLS_LS_TC_MASK         0x00000E00

#define MPLS_LS_TC_SHIFT        9

#define MPLS_LS_S_MASK          0x00000100

#define MPLS_LS_S_SHIFT         8

#define MPLS_LS_TTL_MASK        0x000000FF

#define MPLS_LS_TTL_SHIFT       0



#endif /* _UAPI_MPLS_H */

net/wireless/util.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <net/ip.h>

#include <net/ip.h>

#include <net/dsfield.h>

#include <net/dsfield.h>

#include <linux/if_vlan.h>

#include <linux/if_vlan.h>

#include <linux/mpls.h>

#include "core.h"

#include "core.h"

#include "rdev-ops.h"

#include "rdev-ops.h"
@@ -717,6 +718,21 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb, 
	case htons(ETH_P_IPV6):

	case htons(ETH_P_IPV6):

		dscp = ipv6_get_dsfield(ipv6_hdr(skb)) & 0xfc;

		dscp = ipv6_get_dsfield(ipv6_hdr(skb)) & 0xfc;

		break;

		break;

	case htons(ETH_P_MPLS_UC):

	case htons(ETH_P_MPLS_MC): {

		struct mpls_label mpls_tmp, *mpls;



		mpls = skb_header_pointer(skb, sizeof(struct ethhdr),

					  sizeof(*mpls), &mpls_tmp);

		if (!mpls)

			return 0;



		return (ntohl(mpls->entry) & MPLS_LS_TC_MASK)

			>> MPLS_LS_TC_SHIFT;

	}

	case htons(ETH_P_80221):

		/* 802.21 is always network control traffic */

		return 7;

	default:

	default:

		return 0;

		return 0;

	}

	}