projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
730fc43
)
net: Remove superfluous setting of key_basic
author
Tom Herbert
<
[email protected]
>
Thu, 4 Jun 2015 16:16:38 +0000
(09:16 -0700)
committer
David S. Miller
<
[email protected]
>
Thu, 4 Jun 2015 22:44:30 +0000
(15:44 -0700)
key_basic is set twice in __skb_flow_dissect which seems unnecessary.
Remove second one.
Acked-by: Jiri Pirko <
[email protected]
>
Signed-off-by: Tom Herbert <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/core/flow_dissector.c
patch
|
blob
|
history
diff --git
a/net/core/flow_dissector.c
b/net/core/flow_dissector.c
index 7f699169dc9265bd6281bcbca4174f42fa3b3b83..0763795bea8f8c85ade60801979815cbaa678b9a 100644
(file)
--- 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;