Commit 75ef7cdd 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:
  net: bug fix for vlan + gro issue
  tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
  cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
  IPv6: better document max_addresses parameter
  MAINTAINERS: update mv643xx_eth maintenance status
  e1000: Fix DMA mapping error handling on RX
  iwlwifi: sanity check before counting number of tfds can be free
  iwlwifi: error checking for number of tfds in queue
  iwlwifi: set HT flags after channel in rxon
parents be64c970 c4d49794

Documentation/networking/ip-sysctl.txt

+4 −4
Original line number Diff line number Diff line
@@ -1074,10 +1074,10 @@ regen_max_retry - INTEGER 
	Default: 5



max_addresses - INTEGER

	Number of maximum addresses per interface.  0 disables limitation.

	It is recommended not set too large value (or 0) because it would

	be too easy way to crash kernel to allow to create too much of

	autoconfigured addresses.

	Maximum number of autoconfigured addresses per interface.  Setting

	to zero disables the limitation.  It is not recommended to set this

	value too large (or to zero) because it would be an easy way to

	crash the kernel by allowing too many addresses to be created.

	Default: 16



disable_ipv6 - BOOLEAN

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3489,9 +3489,9 @@ S: Maintained 
F:	drivers/net/wireless/libertas/



MARVELL MV643XX ETHERNET DRIVER

M:	Lennert Buytenhek <buytenh@marvell.com>

M:	Lennert Buytenhek <buytenh@wantstofly.org>

L:	netdev@vger.kernel.org

S:	Supported

S:	Maintained

F:	drivers/net/mv643xx_eth.*

F:	include/linux/mv643xx.h

drivers/net/e1000/e1000_main.c

+18 −1
Original line number Diff line number Diff line
@@ -4006,11 +4006,21 @@ check_page: 
			}

		}



		if (!buffer_info->dma)

		if (!buffer_info->dma) {

			buffer_info->dma = pci_map_page(pdev,

			                                buffer_info->page, 0,

			                                buffer_info->length,

			                                PCI_DMA_FROMDEVICE);

			if (pci_dma_mapping_error(pdev, buffer_info->dma)) {

				put_page(buffer_info->page);

				dev_kfree_skb(skb);

				buffer_info->page = NULL;

				buffer_info->skb = NULL;

				buffer_info->dma = 0;

				adapter->alloc_rx_buff_failed++;

				break; /* while !buffer_info->skb */

			}

		}



		rx_desc = E1000_RX_DESC(*rx_ring, i);

		rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
@@ -4101,6 +4111,13 @@ map_skb: 
						  skb->data,

						  buffer_info->length,

						  PCI_DMA_FROMDEVICE);

		if (pci_dma_mapping_error(pdev, buffer_info->dma)) {

			dev_kfree_skb(skb);

			buffer_info->skb = NULL;

			buffer_info->dma = 0;

			adapter->alloc_rx_buff_failed++;

			break; /* while !buffer_info->skb */

		}



		/*

		 * XXX if it was allocated cleanly it will never map to a

drivers/net/tc35815.c

+0 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,6 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status, int limit) 
		/* Transmit complete. */

		lp->lstats.tx_ints++;

		tc35815_txdone(dev);

		netif_wake_queue(dev);

		if (ret < 0)

			ret = 0;

	}

drivers/net/usb/cdc_ether.c

+5 −0
Original line number Diff line number Diff line
@@ -583,6 +583,11 @@ static const struct usb_device_id products [] = { 
	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,

			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long) &mbm_info,

}, {

	/* Ericsson C3607w ver 2 */

	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190b, USB_CLASS_COMM,

			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long) &mbm_info,

}, {

	/* Toshiba F3507g */

	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,

CRA Git | Maintained and supported by SUSTech CRA and CCSE