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

Commit 13199a08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking changes from David S. Miller:

 1) Fix IPSEC header length calculation for transport mode in ESP.  The
    issue is whether to do the calculation before or after alignment.
    Fix from Benjamin Poirier.

 2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao
    Feng.  This is another transport vs tunnel mode issue.

 3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes.  Fix
    from James Chapman.

 4) Fix USB ASIX driver's reception of full sized VLAN packets, from
    Eric Dumazet.

 5) Allow drop monitor (and, more generically, all generic netlink
    protocols) to be automatically loaded as a module.  From Neil
    Horman.

Fix up trivial conflict in Documentation/feature-removal-schedule.txt
due to new entries added next to each other at the end. As usual.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
  net/smsc911x: Repair broken failure paths
  virtio-net: remove useless disable on freeze
  netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
  drop_monitor: Add module alias to enable automatic module loading
  genetlink: Build a generic netlink family module alias
  net: add MODULE_ALIAS_NET_PF_PROTO_NAME
  r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)
  r6040: disable pci device if the subsequent calls (after pci_enable_device) fails
  skb: avoid unnecessary reallocations in __skb_cow
  net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens
  asix: allow full size 8021Q frames to be received
  rds_rdma: don't assume infiniband device is PCI
  l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
  mac80211: fix ADDBA declined after suspend with wowlan
  wlcore: fix undefined symbols when CONFIG_PM is not defined
  mac80211: fix flag check for QoS NOACK frames
  ath9k_hw: apply internal regulator settings on AR933x
  ath9k_hw: update AR933x initvals to fix issues with high power devices
  ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
  ath9k: stop rx dma before stopping tx
  ...
parents af56e0aa 2e1d4a06

Documentation/feature-removal-schedule.txt

+6 −0
Original line number Diff line number Diff line
@@ -606,3 +606,9 @@ Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support 
Who:	Ludovic Desroches <ludovic.desroches@atmel.com>



----------------------------



What:	net/wanrouter/

When:	June 2013

Why:	Unsupported/unmaintained/unused since 2.6



----------------------------

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6657,7 +6657,7 @@ F: include/linux/taskstats* 
F:	kernel/taskstats.c



TC CLASSIFIER

M:	Jamal Hadi Salim <hadi@cyberus.ca>

M:	Jamal Hadi Salim <jhs@mojatatu.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	include/linux/pkt_cls.h

drivers/atm/solos-pci.c

+3 −1
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card) 
			} else if (skb && card->using_dma) {

				SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,

								       skb->len, PCI_DMA_TODEVICE);

				card->tx_skb[port] = skb;

				iowrite32(SKB_CB(skb)->dma_addr,

					  card->config_regs + TX_DMA_ADDR(port));

			}
@@ -1153,6 +1154,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	}



	if (card->fpga_version >= DMA_SUPPORTED) {

		pci_set_master(dev);

		card->using_dma = 1;

	} else {

		card->using_dma = 0;

drivers/net/ethernet/rdc/r6040.c

+11 −4
Original line number Diff line number Diff line
@@ -1096,20 +1096,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, 
	if (err) {

		dev_err(&pdev->dev, "32-bit PCI DMA addresses"

				"not supported by the card\n");

		goto err_out;

		goto err_out_disable_dev;

	}

	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev, "32-bit PCI DMA addresses"

				"not supported by the card\n");

		goto err_out;

		goto err_out_disable_dev;

	}



	/* IO Size check */

	if (pci_resource_len(pdev, bar) < io_size) {

		dev_err(&pdev->dev, "Insufficient PCI resources, aborting\n");

		err = -EIO;

		goto err_out;

		goto err_out_disable_dev;

	}



	pci_set_master(pdev);
@@ -1117,7 +1117,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, 
	dev = alloc_etherdev(sizeof(struct r6040_private));

	if (!dev) {

		err = -ENOMEM;

		goto err_out;

		goto err_out_disable_dev;

	}

	SET_NETDEV_DEV(dev, &pdev->dev);

	lp = netdev_priv(dev);
@@ -1233,11 +1233,15 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, 
err_out_mdio:

	mdiobus_free(lp->mii_bus);

err_out_unmap:

	netif_napi_del(&lp->napi);

	pci_set_drvdata(pdev, NULL);

	pci_iounmap(pdev, ioaddr);

err_out_free_res:

	pci_release_regions(pdev);

err_out_free_dev:

	free_netdev(dev);

err_out_disable_dev:

	pci_disable_device(pdev);

err_out:

	return err;

}
@@ -1251,6 +1255,9 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev) 
	mdiobus_unregister(lp->mii_bus);

	kfree(lp->mii_bus->irq);

	mdiobus_free(lp->mii_bus);

	netif_napi_del(&lp->napi);

	pci_set_drvdata(pdev, NULL);

	pci_iounmap(pdev, lp->base);

	pci_release_regions(pdev);

	free_netdev(dev);

	pci_disable_device(pdev);

drivers/net/ethernet/renesas/sh_eth.c

+5 −3
Original line number Diff line number Diff line
@@ -1101,8 +1101,12 @@ static int sh_eth_rx(struct net_device *ndev) 


	/* Restart Rx engine if stopped. */

	/* If we don't need to check status, don't. -KDU */

	if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R))

	if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) {

		/* fix the values for the next receiving */

		mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) -

					       sh_eth_read(ndev, RDLAR)) >> 4;

		sh_eth_write(ndev, EDRRR_R, EDRRR);

	}



	return 0;

}
@@ -1199,8 +1203,6 @@ static void sh_eth_error(struct net_device *ndev, int intr_status) 
		/* Receive Descriptor Empty int */

		ndev->stats.rx_over_errors++;



		if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R)

			sh_eth_write(ndev, EDRRR_R, EDRRR);

		if (netif_msg_rx_err(mdp))

			dev_err(&ndev->dev, "Receive Descriptor Empty\n");

	}