Thread (16 messages) 16 messages, 3 authors, 2015-05-31
STALE4028d REVIEWED: 8 (8M)
Revisions (5)
  1. v1 [diff vs current]
  2. v3 [diff vs current]
  3. v4 [diff vs current]
  4. v4 current
  5. v6 [diff vs current]

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

From: Tom Herbert <hidden>
Date: 2015-05-28 18:19:29
Subsystem: networking [general], the rest · Maintainers: "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

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 <redacted>
---
 net/core/flow_dissector.c | 6 ------
 1 file changed, 6 deletions(-)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 7f69916..0763795 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;
-- 
1.8.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help