diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-01 21:35:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-01 21:35:16 -0800 |
| commit | aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b (patch) | |
| tree | 22ef88d84a2e06380bb6a853c3ba28657e4e5f92 /net/core | |
| parent | 814c01dc7c533033b4e99981a2e24a6195bfb43c (diff) | |
| parent | 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 (diff) | |
| download | op-kernel-dev-aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b.zip op-kernel-dev-aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
net/8021q/vlan_core.c
net/core/dev.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ac6ab12..bcd0c21 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2487,6 +2487,9 @@ int napi_skb_finish(int ret, struct sk_buff *skb) { int err = NET_RX_SUCCESS; + if (netpoll_receive_skb(skb)) + return NET_RX_DROP; + switch (ret) { case GRO_NORMAL: return netif_receive_skb(skb); @@ -2584,6 +2587,9 @@ int napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, int ret) { int err = NET_RX_SUCCESS; + if (netpoll_receive_skb(skb)) + return NET_RX_DROP; + switch (ret) { case GRO_NORMAL: case GRO_HELD: |
