Commit ce3b5355 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: Simplify GRE case in flow_dissector 



Do break when we see routing flag or a non-zero version number in GRE
header.

Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffaa31d7

net/core/flow_dissector.c

+22 −22
Original line number Diff line number Diff line
@@ -308,7 +308,9 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		 * Only look inside GRE if version zero and no

		 * routing

		 */

		if (!(hdr->flags & (GRE_VERSION|GRE_ROUTING))) {

		if (hdr->flags & (GRE_VERSION | GRE_ROUTING))

			break;



		proto = hdr->proto;

		nhoff += 4;

		if (hdr->flags & GRE_CSUM)
@@ -331,8 +333,6 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		}

		goto again;

	}

		break;

	}

	case IPPROTO_IPIP:

		proto = htons(ETH_P_IP);

		goto ip;