diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-08-25 17:03:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-25 17:21:26 -0700 |
| commit | 453a940ea725d692282f9e66475cec0d1b1e12f2 (patch) | |
| tree | b7c1aa76d72315c12b159d3f6253499b56b6779e /include/net | |
| parent | 6451b3f59ab39162d1fbb5a5d0c8f46c0d9e1231 (diff) | |
| download | op-kernel-dev-453a940ea725d692282f9e66475cec0d1b1e12f2.zip op-kernel-dev-453a940ea725d692282f9e66475cec0d1b1e12f2.tar.gz | |
net: make skb an optional parameter for__skb_flow_dissect()
Fixes: commit 690e36e726d00d2 (net: Allow raw buffers to be passed into the flow dissector)
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/flow_keys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h index 4040f63..9a03f73 100644 --- a/include/net/flow_keys.h +++ b/include/net/flow_keys.h @@ -28,10 +28,10 @@ struct flow_keys { }; bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow, - void *data, int hlen); + void *data, __be16 proto, int nhoff, int hlen); static inline bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) { - return __skb_flow_dissect(skb, flow, NULL, 0); + return __skb_flow_dissect(skb, flow, NULL, 0, 0, 0); } __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto, void *data, int hlen_proto); |
