Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index ac6ab12d3297a11ed0a78d41bf4ab14a5ca7cfc3..bcd0c2154bb2ebea8336a47b7989e97a051bc63c 100644 (file)
--- 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: