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

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / i825xx / lib82596.c

diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index f045ea4dc5144e60be6fd25b730e8fabc65f2871..d653bac4cfc4e2be49d1ab1ff9a1247eae5460aa 100644 (file)
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -715,14 +715,12 @@ static inline int i596_rx(struct net_device *dev)
                                rbd->v_data = newskb->data;
                                rbd->b_data = SWAP32(dma_addr);
                                DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
-                       } else
+                       } else {
                                skb = netdev_alloc_skb_ip_align(dev, pkt_len);
+                       }
 memory_squeeze:
                        if (skb == NULL) {
                                /* XXX tulip.c can defer packets here!! */
-                               printk(KERN_ERR
-                                      "%s: i596_rx Memory squeeze, dropping packet.\n",
-                                      dev->name);
                                dev->stats.rx_dropped++;
                        } else {
                                if (!rx_in_place) {