diff options
| author |   Tom Herbert <tom@herbertland.com> | 2015-09-01 09:24:27 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-01 15:06:22 -0700 |
| commit | cd79a2382aa5dcefa6e21a7c59bb1bb19e53b74d (patch) | |
| tree | c252b8dd90eddc8d635356e8b394bd455cac51c0 /net/core/flow_dissector.c | |
| parent | flow_dissector: Jump to exit code in __skb_flow_dissect (diff) | |
| download | linux-dev-cd79a2382aa5dcefa6e21a7c59bb1bb19e53b74d.tar.xz linux-dev-cd79a2382aa5dcefa6e21a7c59bb1bb19e53b74d.zip | |
flow_dissector: Add flags argument to skb_flow_dissector functions
The flags argument will allow control of the dissection process (for
instance whether to parse beyond L3).
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/flow_dissector.c')
| -rw-r--r-- | net/core/flow_dissector.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 22f3d768b459..c3d9807cb34e 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -121,7 +121,8 @@ EXPORT_SYMBOL(__skb_flow_get_ports); bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector *flow_dissector, void *target_container, - void *data, __be16 proto, int nhoff, int hlen) + void *data, __be16 proto, int nhoff, int hlen, + unsigned int flags) { struct flow_dissector_key_control *key_control; struct flow_dissector_key_basic *key_basic; @@ -556,7 +557,7 @@ EXPORT_SYMBOL(flow_hash_from_keys); static inline u32 ___skb_get_hash(const struct sk_buff *skb, struct flow_keys *keys, u32 keyval) { - if (!skb_flow_dissect_flow_keys(skb, keys)) + if (!skb_flow_dissect_flow_keys(skb, keys, 0)) return 0; return __flow_hash_from_keys(keys, keyval); @@ -726,7 +727,7 @@ u32 skb_get_poff(const struct sk_buff *skb) { struct flow_keys keys; - if (!skb_flow_dissect_flow_keys(skb, &keys)) + if (!skb_flow_dissect_flow_keys(skb, &keys, 0)) return 0; return __skb_get_poff(skb, skb->data, &keys, skb_headlen(skb)); |