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

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 55 insertions, 21 deletions

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 6c99ff0b0bdd..945f532078e9 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -78,6 +78,9 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
 
         priv = devm_kzalloc(&pdev->dev, sizeof(struct com20020_priv),
                             GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
         ci = (struct com20020_pci_card_info *)id->driver_data;
         priv->ci = ci;
 
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 1230f52aa70e..2540ef0142af 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -139,7 +139,8 @@ static int mv88e6131_setup_global(struct dsa_switch *ds)
                 int nexthop;
 
                 nexthop = 0x1f;
-                if (i != ds->index && i < ds->dst->pd->nr_chips)
+                if (ds->pd->rtable &&
+                    i != ds->index && i < ds->dst->pd->nr_chips)
                         nexthop = ds->pd->rtable[i] & 0x1f;
 
                 REG_WRITE(REG_GLOBAL2, 0x06, 0x8000 | (i << 8) | nexthop);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index d41f9f468688..b93d4404d975 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -342,12 +342,13 @@ static irqreturn_t xgbe_isr(int irq, void *data)
                 dma_ch_isr = XGMAC_DMA_IOREAD(channel, DMA_CH_SR);
                 DBGPR("  DMA_CH%u_ISR = %08x\n", i, dma_ch_isr);
 
-                /* If we get a TI or RI interrupt that means per channel DMA
-                 * interrupts are not enabled, so we use the private data napi
-                 * structure, not the per channel napi structure
+                /* The TI or RI interrupt bits may still be set even if using
+                 * per channel DMA interrupts. Check to be sure those are not
+                 * enabled before using the private data napi structure.
                  */
-                if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, TI) ||
-                    XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RI)) {
+                if (!pdata->per_channel_irq &&
+                    (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, TI) ||
+                     XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RI))) {
                         if (napi_schedule_prep(&pdata->napi)) {
                                 /* Disable Tx and Rx interrupts */
                                 xgbe_disable_rx_tx_ints(pdata);
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
index 11288d4fc85f..c8a01ee4d25e 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
@@ -364,6 +364,26 @@ static int sxgbe_init_rx_buffers(struct net_device *dev,
 
         return 0;
 }
+
+/**
+ * sxgbe_free_rx_buffers - free what sxgbe_init_rx_buffers() allocated
+ * @dev: net device structure
+ * @rx_ring: ring to be freed
+ * @rx_rsize: ring size
+ * Description:  this function initializes the DMA RX descriptor
+ */
+static void sxgbe_free_rx_buffers(struct net_device *dev,
+                                  struct sxgbe_rx_norm_desc *p, int i,
+                                  unsigned int dma_buf_sz,
+                                  struct sxgbe_rx_queue *rx_ring)
+{
+        struct sxgbe_priv_data *priv = netdev_priv(dev);
+
+        kfree_skb(rx_ring->rx_skbuff[i]);
+        dma_unmap_single(priv->device, rx_ring->rx_skbuff_dma[i],
+                         dma_buf_sz, DMA_FROM_DEVICE);
+}
+
 /**
  * init_tx_ring - init the TX descriptor ring
  * @dev: net device structure
@@ -456,7 +476,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
         /* RX ring is not allcoated */
         if (rx_ring == NULL) {
                 netdev_err(dev, "No memory for RX queue\n");
-                goto error;
+                return -ENOMEM;
         }
 
         /* assign queue number */
@@ -468,23 +488,21 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
                                               &rx_ring->dma_rx_phy, GFP_KERNEL);
 
         if (rx_ring->dma_rx == NULL)
-                goto error;
+                return -ENOMEM;
 
         /* allocate memory for RX skbuff array */
         rx_ring->rx_skbuff_dma = kmalloc_array(rx_rsize,
                                                sizeof(dma_addr_t), GFP_KERNEL);
         if (!rx_ring->rx_skbuff_dma) {
-                dma_free_coherent(priv->device,
-                                  rx_rsize * sizeof(struct sxgbe_rx_norm_desc),
-                                  rx_ring->dma_rx, rx_ring->dma_rx_phy);
-                goto error;
+                ret = -ENOMEM;
+                goto err_free_dma_rx;
         }
 
         rx_ring->rx_skbuff = kmalloc_array(rx_rsize,
                                            sizeof(struct sk_buff *), GFP_KERNEL);
         if (!rx_ring->rx_skbuff) {
-                kfree(rx_ring->rx_skbuff_dma);
-                goto error;
+                ret = -ENOMEM;
+                goto err_free_skbuff_dma;
         }
 
         /* initialise the buffers */
@@ -494,7 +512,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
                 ret = sxgbe_init_rx_buffers(dev, p, desc_index,
                                             bfsize, rx_ring);
                 if (ret)
-                        goto err_init_rx_buffers;
+                        goto err_free_rx_buffers;
         }
 
         /* initalise counters */
@@ -504,11 +522,22 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
 
         return 0;
 
-err_init_rx_buffers:
-        while (--desc_index >= 0)
-                free_rx_ring(priv->device, rx_ring, desc_index);
-error:
-        return -ENOMEM;
+err_free_rx_buffers:
+        while (--desc_index >= 0) {
+                struct sxgbe_rx_norm_desc *p;
+
+                p = rx_ring->dma_rx + desc_index;
+                sxgbe_free_rx_buffers(dev, p, desc_index, bfsize, rx_ring);
+        }
+        kfree(rx_ring->rx_skbuff);
+err_free_skbuff_dma:
+        kfree(rx_ring->rx_skbuff_dma);
+err_free_dma_rx:
+        dma_free_coherent(priv->device,
+                          rx_rsize * sizeof(struct sxgbe_rx_norm_desc),
+                          rx_ring->dma_rx, rx_ring->dma_rx_phy);
+
+        return ret;
 }
 /**
  * free_tx_ring - free the TX descriptor ring
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index e6ed3e66964d..0e57e862c399 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1009,7 +1009,7 @@ static bool vxlan_snoop(struct net_device *dev,
                 if (net_ratelimit())
                         netdev_info(dev,
                                     "%pM migrated from %pIS to %pIS\n",
-                                    src_mac, &rdst->remote_ip, &src_ip);
+                                    src_mac, &rdst->remote_ip.sa, &src_ip->sa);
 
                 rdst->remote_ip = *src_ip;
                 f->updated = jiffies;