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

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

Merge branch 'flow_dissector-next' 



Tom Herbert says:

====================
flow_dissector: Fix MPLS parsing and add ext hdr support

Need to shift label. Added parsing of dst, hop-by-hop, and routing
extension headers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b60f2f3d 6a74fcf4

net/core/flow_dissector.c

+19 −2
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		if (!hdr)

			return false;



		if ((ntohl(hdr[0].entry) & MPLS_LS_LABEL_MASK) ==

		     MPLS_LABEL_ENTROPY) {

		if ((ntohl(hdr[0].entry) & MPLS_LS_LABEL_MASK) >>

		     MPLS_LS_LABEL_SHIFT == MPLS_LABEL_ENTROPY) {

			if (skb_flow_dissector_uses_key(flow_dissector,

							FLOW_DISSECTOR_KEY_MPLS_ENTROPY)) {

				key_keyid = skb_flow_dissector_target(flow_dissector,
@@ -327,6 +327,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		return false;

	}



ip_proto_again:

	switch (ip_proto) {

	case IPPROTO_GRE: {

		struct gre_hdr {
@@ -383,6 +384,22 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		}

		goto again;

	}

	case NEXTHDR_HOP:

	case NEXTHDR_ROUTING:

	case NEXTHDR_DEST: {

		u8 _opthdr[2], *opthdr;



		if (proto != htons(ETH_P_IPV6))

			break;



		opthdr = __skb_header_pointer(skb, nhoff, sizeof(_opthdr),

					      data, hlen, &_opthdr);



		ip_proto = _opthdr[0];

		nhoff += (_opthdr[1] + 1) << 3;



		goto ip_proto_again;

	}

	case IPPROTO_IPIP:

		proto = htons(ETH_P_IP);

		goto ip;