diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /net/core/flow_dissector.c | |
| parent | net: fix psock_fanout selftest hash collision (diff) | |
| parent | net: fec: Define indexes as 'unsigned int' (diff) | |
| download | linux-dev-61816596d1c9026d0ecb20c44f90452c41596ffe.tar.xz linux-dev-61816596d1c9026d0ecb20c44f90452c41596ffe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index f8d9e03b7a7c..f4be293bab9e 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -151,6 +151,8 @@ ipv6: flow->ports = *ports; } + flow->thoff = (u16) nhoff; + return true; } EXPORT_SYMBOL(skb_flow_dissect); |