summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2015-06-04 18:16:38 +0200
committerDavid S. Miller <davem@davemloft.net>2015-06-05 00:44:30 +0200
commitc468efe2c7d478bad8855f7d170cf245ee0f1b3f (patch)
tree8d621a6dcb1632c44b7d3b48b5b0a14b9b74036e
parentmpls: Add definition for IPPROTO_MPLS (diff)
downloadlinux-c468efe2c7d478bad8855f7d170cf245ee0f1b3f.tar.xz
linux-c468efe2c7d478bad8855f7d170cf245ee0f1b3f.zip
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>
-rw-r--r--net/core/flow_dissector.c6
1 files changed, 0 insertions, 6 deletions
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;