diff mbox

[v4,net-next,03/11] net: Remove superfluous setting of key_basic

Message ID 1432253506-3646977-4-git-send-email-tom@herbertland.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Tom Herbert May 22, 2015, 12:11 a.m. UTC
key_basic is set twice in __skb_flow_dissect which seems unnecessary.
Remove second one.

Signed-off-by: Tom Herbert <tom@herbertland.com>
---
 net/core/flow_dissector.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Jiri Pirko May 22, 2015, 6:37 a.m. UTC | #1
Fri, May 22, 2015 at 02:11:38AM CEST, tom@herbertland.com wrote:
>key_basic is set twice in __skb_flow_dissect which seems unnecessary.
>Remove second one.
>
>Signed-off-by: Tom Herbert <tom@herbertland.com>

I have the same patch in my queue :)

Acked-by: Jiri Pirko <jiri@resnulli.us>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 4a2cb93..6aebe99 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;