diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-04-01 11:20:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-02 01:07:37 -0700 |
| commit | f2bde7328633269ee935d9ed96535ade15cc348f (patch) | |
| tree | 5691cd6965cc7dae9d29b79fd9facfdc4c18199e /net | |
| parent | d78ad8cbfe73ad568de38814a75e9c92ad0a907c (diff) | |
| download | linux-f2bde7328633269ee935d9ed96535ade15cc348f.tar.gz linux-f2bde7328633269ee935d9ed96535ade15cc348f.tar.bz2 linux-f2bde7328633269ee935d9ed96535ade15cc348f.zip | |
net: allow multiple dev per napi with GRO
GRO assumes that there is a one-to-one relationship between NAPI
structure and network device. Some devices like sky2 share multiple
devices on a single interrupt so only have one NAPI handler. Rather than
split GRO from NAPI, just have GRO assume if device changes that
it is a different flow.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 52fea5b28ca6..91d792d17e09 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2472,8 +2472,9 @@ static int __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) return GRO_NORMAL; for (p = napi->gro_list; p; p = p->next) { - NAPI_GRO_CB(p)->same_flow = !compare_ether_header( - skb_mac_header(p), skb_gro_mac_header(skb)); + NAPI_GRO_CB(p)->same_flow = (p->dev == skb->dev) + && !compare_ether_header(skb_mac_header(p), + skb_gro_mac_header(skb)); NAPI_GRO_CB(p)->flush = 0; } |