Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / sun / sunqe.c

diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 49bf3e2eb652316757e2781ef7e703171c868414..8182591bc1876c77ddae935d6da64d9200a2dbcc 100644 (file)
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -414,7 +414,7 @@ static void qe_rx(struct sunqe *qep)
        struct qe_rxd *this;
        struct sunqe_buffers *qbufs = qep->buffers;
        __u32 qbufs_dvma = qep->buffers_dvma;
-       int elem = qep->rx_new, drops = 0;
+       int elem = qep->rx_new;
        u32 flags;
 
        this = &rxbase[elem];
@@ -436,7 +436,6 @@ static void qe_rx(struct sunqe *qep)
                } else {
                        skb = netdev_alloc_skb(dev, len + 2);
                        if (skb == NULL) {
-                               drops++;
                                dev->stats.rx_dropped++;
                        } else {
                                skb_reserve(skb, 2);
@@ -456,8 +455,6 @@ static void qe_rx(struct sunqe *qep)
                this = &rxbase[elem];
        }
        qep->rx_new = elem;
-       if (drops)
-               printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", qep->dev->name);
 }
 
 static void qe_tx_reclaim(struct sunqe *qep);