Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aac2b1f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking updates from David Miller:

 1) UAPI changes for networking from David Howells

 2) A netlink dump is an operation we can sleep within, and therefore we
    need to make sure the dump provider module doesn't disappear on us
    meanwhile.  Fix from Gao Feng.

 3) Now that tunnels support GRO, we have to be more careful in
    skb_gro_reset_offset() otherwise we OOPS, from Eric Dumazet.

 4) We can end up processing packets for VLANs we aren't actually
    configured to be on, fix from Florian Zumbiehl.

 5) Fix routing cache removal regression in redirects and IPVS.  The
    core issue on the IPVS side is that it wants to rewrite who the
    nexthop is and we have to explicitly accomodate that case.  From
    Julian Anastasov.

 6) Error code return fixes all over the networking drivers from Peter
    Senna Tschudin.

 7) Fix routing cache removal regressions in IPSEC, from Steffen
    Klassert.

 8) Fix deadlock in RDS during pings, from Jeff Liu.

 9) Neighbour packet queue can trigger skb_under_panic() because we do
    not reset the network header of the SKB in the right spot.  From
    Ramesh Nagappa.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
  RDS: fix rds-ping spinlock recursion
  netdev/phy: Prototype of_mdio_find_bus()
  farsync: fix support for over 30 cards
  be2net: Remove code that stops further access to BE NIC based on UE bits
  pch_gbe: Fix build error by selecting all the possible dependencies.
  e1000e: add device IDs for i218
  ixgbe/ixgbevf: Limit maximum jumbo frame size to 9.5K to avoid Tx hangs
  ixgbevf: Set the netdev number of Tx queues
  UAPI: (Scripted) Disintegrate include/linux/tc_ematch
  UAPI: (Scripted) Disintegrate include/linux/tc_act
  UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv6
  UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv4
  UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge
  UAPI: (Scripted) Disintegrate include/linux/netfilter_arp
  UAPI: (Scripted) Disintegrate include/linux/netfilter/ipset
  UAPI: (Scripted) Disintegrate include/linux/netfilter
  UAPI: (Scripted) Disintegrate include/linux/isdn
  UAPI: (Scripted) Disintegrate include/linux/caif
  net: fix typo in freescale/ucc_geth.c
  vxlan: fix more sparse warnings
  ...
parents 23d5385f 5175a5e7

drivers/infiniband/core/cma.c

+2 −1
Original line number Diff line number Diff line
@@ -3498,7 +3498,8 @@ out: 
}



static const struct ibnl_client_cbs cma_cb_table[] = {

	[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats },

	[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats,

				       .module = THIS_MODULE },

};



static int __init cma_init(void)

drivers/infiniband/core/netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
			{

				struct netlink_dump_control c = {

					.dump = client->cb_table[op].dump,

					.module = client->cb_table[op].module,

				};

				return netlink_dump_start(nls, skb, nlh, &c);

			}

drivers/net/ethernet/amd/amd8111e.c

+2 −0
Original line number Diff line number Diff line
@@ -1845,6 +1845,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 
	if((pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM))==0){

		printk(KERN_ERR "amd8111e: No Power Management capability, "

		       "exiting.\n");

		err = -ENODEV;

		goto err_free_reg;

	}
@@ -1852,6 +1853,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 
	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) < 0) {

		printk(KERN_ERR "amd8111e: DMA not supported,"

			"exiting.\n");

		err = -ENODEV;

		goto err_free_reg;

	}

drivers/net/ethernet/amd/au1000_eth.c

+8 −2
Original line number Diff line number Diff line
@@ -1174,8 +1174,10 @@ static int __devinit au1000_probe(struct platform_device *pdev) 
	snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",

		pdev->name, aup->mac_id);

	aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

	if (aup->mii_bus->irq == NULL)

	if (aup->mii_bus->irq == NULL) {

		err = -ENOMEM;

		goto err_out;

	}



	for (i = 0; i < PHY_MAX_ADDR; ++i)

		aup->mii_bus->irq[i] = PHY_POLL;
@@ -1190,7 +1192,8 @@ static int __devinit au1000_probe(struct platform_device *pdev) 
		goto err_mdiobus_reg;

	}



	if (au1000_mii_probe(dev) != 0)

	err = au1000_mii_probe(dev);

	if (err != 0)

		goto err_out;



	pDBfree = NULL;
@@ -1205,6 +1208,7 @@ static int __devinit au1000_probe(struct platform_device *pdev) 
	}

	aup->pDBfree = pDBfree;



	err = -ENODEV;

	for (i = 0; i < NUM_RX_DMA; i++) {

		pDB = au1000_GetFreeDB(aup);

		if (!pDB)
@@ -1213,6 +1217,8 @@ static int __devinit au1000_probe(struct platform_device *pdev) 
		aup->rx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;

		aup->rx_db_inuse[i] = pDB;

	}



	err = -ENODEV;

	for (i = 0; i < NUM_TX_DMA; i++) {

		pDB = au1000_GetFreeDB(aup);

		if (!pDB)

drivers/net/ethernet/calxeda/xgmac.c

+2 −17
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ struct xgmac_priv { 
	unsigned int tx_tail;



	void __iomem *base;

	struct sk_buff_head rx_recycle;

	unsigned int dma_buf_sz;

	dma_addr_t dma_rx_phy;

	dma_addr_t dma_tx_phy;
@@ -672,8 +671,6 @@ static void xgmac_rx_refill(struct xgmac_priv *priv) 
		p = priv->dma_rx + entry;



		if (priv->rx_skbuff[entry] == NULL) {

			skb = __skb_dequeue(&priv->rx_recycle);

			if (skb == NULL)

			skb = netdev_alloc_skb(priv->dev, priv->dma_buf_sz);

			if (unlikely(skb == NULL))

				break;
@@ -887,16 +884,6 @@ static void xgmac_tx_complete(struct xgmac_priv *priv) 
				       desc_get_buf_len(p), DMA_TO_DEVICE);

		}



		/*

		 * If there's room in the queue (limit it to size)

		 * we add this skb back into the pool,

		 * if it's the right size.

		 */

		if ((skb_queue_len(&priv->rx_recycle) <

			DMA_RX_RING_SZ) &&

			skb_recycle_check(skb, priv->dma_buf_sz))

			__skb_queue_head(&priv->rx_recycle, skb);

		else

		dev_kfree_skb(skb);

	}
@@ -1016,7 +1003,6 @@ static int xgmac_open(struct net_device *dev) 
			dev->dev_addr);

	}



	skb_queue_head_init(&priv->rx_recycle);

	memset(&priv->xstats, 0, sizeof(struct xgmac_extra_stats));



	/* Initialize the XGMAC and descriptors */
@@ -1053,7 +1039,6 @@ static int xgmac_stop(struct net_device *dev) 
		napi_disable(&priv->napi);



	writel(0, priv->base + XGMAC_DMA_INTR_ENA);

	skb_queue_purge(&priv->rx_recycle);



	/* Disable the MAC core */

	xgmac_mac_disable(priv->base);