From: Tom Herbert <tom@herbertland.com>
Date: Thu, 4 Jun 2015 16:16:38 +0000 (-0700)
Subject: net: Remove superfluous setting of key_basic
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c468efe2c7d478bad8855f7d170cf245ee0f1b3f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

net: Remove superfluous setting of key_basic

key_basic is set twice in __skb_flow_dissect which seems unnecessary.
Remove second one.

Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 7f699169dc92..0763795bea8f 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -343,12 +343,6 @@ flow_label:
 		break;
 	}
 
-	/* It is ensured by skb_flow_dissector_init() that basic key will
-	 * be always present.
-	 */
-	key_basic = skb_flow_dissector_target(flow_dissector,
-					      FLOW_DISSECTOR_KEY_BASIC,
-					      target_container);
 	key_basic->n_proto = proto;
 	key_basic->ip_proto = ip_proto;
 	key_basic->thoff = (u16) nhoff;