Commit 5d7d5d93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
  slip: fix wrong SLIP6 ifdef-endif placing
  natsemi: fix another dma-debug report
  sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket
  net: Fix default in docs for tcp_orphan_retries.
  hso: fix a use after free condition
  net/natsemi: Fix module parameter permissions
  XFRM: Fix memory leak in xfrm_state_update
  sctp: Enforce retransmission limit during shutdown
  mac80211: fix TKIP replay vulnerability
  mac80211: fix ie memory allocation for scheduled scans
  ssb: fix init regression of hostmode PCI core
  rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M
  ath9k: Fix tx throughput drops for AR9003 chips with AES encryption
  carl9170: add NEC WL300NU-AG usbid
  cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex
  ath5k: fix incorrect use of drvdata in PCI suspend/resume code
  ath5k: fix incorrect use of drvdata in sysfs code
  Bluetooth: Fix memory leak under page timeouts
  Bluetooth: Fix regression with incoming L2CAP connections
  Bluetooth: Fix hidp disconnect deadlocks and lost wakeup
  ...
parents 8d86e5f9 7686d1cc

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ tcp_orphan_retries - INTEGER 
	when RTO retransmissions remain unacknowledged.

	See tcp_retries2 for more details.



	The default value is 7.

	The default value is 8.

	If your machine is a loaded WEB server,

	you should think about lowering this value, such sockets

	may consume significant resources. Cf. tcp_max_orphans.

drivers/net/natsemi.c

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ MODULE_LICENSE("GPL"); 
module_param(mtu, int, 0);

module_param(debug, int, 0);

module_param(rx_copybreak, int, 0);

module_param(dspcfg_workaround, int, 1);

module_param(dspcfg_workaround, int, 0);

module_param_array(options, int, NULL, 0);

module_param_array(full_duplex, int, NULL, 0);

MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)");
@@ -2028,8 +2028,8 @@ static void drain_rx(struct net_device *dev) 
		np->rx_ring[i].cmd_status = 0;

		np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */

		if (np->rx_skbuff[i]) {

			pci_unmap_single(np->pci_dev,

				np->rx_dma[i], buflen,

			pci_unmap_single(np->pci_dev, np->rx_dma[i],

				buflen + NATSEMI_PADDING,

				PCI_DMA_FROMDEVICE);

			dev_kfree_skb(np->rx_skbuff[i]);

		}

drivers/net/slip.c

+1 −1
Original line number Diff line number Diff line
@@ -182,10 +182,10 @@ static int sl_alloc_bufs(struct slip *sl, int mtu) 
#ifdef SL_INCLUDE_CSLIP

	cbuff = xchg(&sl->cbuff, cbuff);

	slcomp = xchg(&sl->slcomp, slcomp);

#endif

#ifdef CONFIG_SLIP_MODE_SLIP6

	sl->xdata    = 0;

	sl->xbits    = 0;

#endif

#endif

	spin_unlock_bh(&sl->lock);

	err = 0;

drivers/net/usb/hso.c

+4 −3
Original line number Diff line number Diff line
@@ -2421,10 +2421,8 @@ static void hso_free_net_device(struct hso_device *hso_dev) 


	remove_net_device(hso_net->parent);



	if (hso_net->net) {

	if (hso_net->net)

		unregister_netdev(hso_net->net);

		free_netdev(hso_net->net);

	}



	/* start freeing */

	for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
@@ -2436,6 +2434,9 @@ static void hso_free_net_device(struct hso_device *hso_dev) 
	kfree(hso_net->mux_bulk_tx_buf);

	hso_net->mux_bulk_tx_buf = NULL;



	if (hso_net->net)

		free_netdev(hso_net->net);



	kfree(hso_dev);

}

drivers/net/wireless/ath/ath5k/pci.c

+5 −2
Original line number Diff line number Diff line
@@ -297,7 +297,9 @@ ath5k_pci_remove(struct pci_dev *pdev) 
#ifdef CONFIG_PM_SLEEP

static int ath5k_pci_suspend(struct device *dev)

{

	struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath5k_softc *sc = hw->priv;



	ath5k_led_off(sc);

	return 0;
@@ -306,7 +308,8 @@ static int ath5k_pci_suspend(struct device *dev) 
static int ath5k_pci_resume(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct ath5k_softc *sc = pci_get_drvdata(pdev);

	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath5k_softc *sc = hw->priv;



	/*

	 * Suspend/Resume resets the PCI configuration space, so we have to

CRA Git | Maintained and supported by SUSTech CRA and CCSE