diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-23 14:40:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-23 14:40:29 -0700 |
| commit | bb05ea7e59f26ebd7808bb39deb91b7f19f589b7 (patch) | |
| tree | c3f002369ac3d8c478efb797561e9069f7c35f98 /net | |
| parent | eef929622b0ce86fcdaf6bd9ab6d7502470728d5 (diff) | |
| parent | 4cfe878537cec0e9c0f84b93cc6aa9526f6942b5 (diff) | |
Merge branch 'enic'
Govindarajulu Varadarajan says:
====================
enic updates
This series fixes minor bugs and adds new features like Accelerated RFS,
busy_poll, tx clean-up in napi_poll.
v3:
* While doing tx cleanup in napi, ignore budget and clean up all desc possible.
v2:
* Fix #ifdef coding style issue in '[PATCH 4/8] enic: alloc/free rx_cpu_rmap'
And [PATCH 5/8] enic: Add Accelerated RFS support'
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/flow_dissector.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 107ed12a5323..c2b53c1b21d2 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -175,6 +175,7 @@ ipv6: break; } + flow->n_proto = proto; flow->ip_proto = ip_proto; flow->ports = skb_flow_get_ports(skb, nhoff, ip_proto); flow->thoff = (u16) nhoff; |