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

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / pasemi / pasemi_mac.c

diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 0be5844d637266035299014f85b8b1058944cd43..a5f0b5da614933c74ebbf005edba139b4bb74b88 100644 (file)
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -441,12 +441,11 @@ static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
 
        ring->buffers = dma_alloc_coherent(&mac->dma_pdev->dev,
                                           RX_RING_SIZE * sizeof(u64),
-                                          &ring->buf_dma, GFP_KERNEL);
+                                          &ring->buf_dma,
+                                          GFP_KERNEL | __GFP_ZERO);
        if (!ring->buffers)
                goto out_ring_desc;
 
-       memset(ring->buffers, 0, RX_RING_SIZE * sizeof(u64));
-
        write_dma_reg(PAS_DMA_RXCHAN_BASEL(chno),
                      PAS_DMA_RXCHAN_BASEL_BRBL(ring->chan.ring_dma));
 
@@ -579,8 +578,9 @@ static void pasemi_mac_free_tx_resources(struct pasemi_mac *mac)
                                                (TX_RING_SIZE-1)].dma;
                        freed = pasemi_mac_unmap_tx_skb(mac, nfrags,
                                                        info->skb, dmas);
-               } else
+               } else {
                        freed = 2;
+               }
        }
 
        kfree(txring->ring_info);
@@ -808,8 +808,9 @@ static int pasemi_mac_clean_rx(struct pasemi_mac_rxring *rx,
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                        skb->csum = (macrx & XCT_MACRX_CSUM_M) >>
                                           XCT_MACRX_CSUM_S;
-               } else
+               } else {
                        skb_checksum_none_assert(skb);
+               }
 
                packets++;
                tot_bytes += len;
@@ -1829,10 +1830,11 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                dev_err(&mac->pdev->dev, "register_netdev failed with error %d\n",
                        err);
                goto out;
-       } else if netif_msg_probe(mac)
+       } else if (netif_msg_probe(mac)) {
                printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %pM\n",
                       dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI",
                       mac->dma_if, dev->dev_addr);
+       }
 
        return err;