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

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

diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index 1c54e229e3cc94ed8ff0eb630bd9acc70cb20a8d..e38816145395c9e2b08416934e0b10b6352b4507 100644 (file)
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -798,16 +798,14 @@ static inline int i596_rx(struct net_device *dev)
 #ifdef __mc68000__
                                cache_clear(virt_to_phys(newskb->data), PKT_BUF_SZ);
 #endif
-                       }
-                       else
+                       } else {
                                skb = netdev_alloc_skb(dev, pkt_len + 2);
+                       }
 memory_squeeze:
                        if (skb == NULL) {
                                /* XXX tulip.c can defer packets here!! */
-                               printk(KERN_WARNING "%s: i596_rx Memory squeeze, dropping packet.\n", dev->name);
                                dev->stats.rx_dropped++;
-                       }
-                       else {
+                       } else {
                                if (!rx_in_place) {
                                        /* 16 byte align the data fields */
                                        skb_reserve(skb, 2);