Commit 7b85425f 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: (31 commits)
  Revert "ipv4: arp announce, arp_proxy and windows ip conflict verification"
  igb: return PCI_ERS_RESULT_DISCONNECT on permanent error
  e1000e: io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT
  e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error
  e1000: fix unmap bug
  igb: fix unmap length bug
  ixgbe: fix unmap length bug
  ixgbe: Fix link capabilities during adapter resets
  ixgbe: Fix device capabilities of 82599 single speed fiber NICs.
  ixgbe: Fix SFP log messages
  usbnet: Remove private stats structure
  usbnet: Use netdev stats structure
  smsc95xx: Use netdev stats structure
  rndis_host: Use netdev stats structure
  net1080: Use netdev stats structure
  dm9601: Use netdev stats structure
  cdc_eem: Use netdev stats structure
  ipv4: Fix fib_trie rebalancing, part 3
  bnx2x: Fix the behavior of ethtool when ONBOOT=no
  sctp: xmit sctp packet always return no route error
  ...
parents 57d81f6f f8a68e75

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2931,7 +2931,7 @@ P: Dmitry Eremin-Solenikov 
M:	dbaryshkov@gmail.com

P:	Sergey Lapin

M:	slapin@ossfans.org

L:	linux-zigbee-devel@lists.sourceforge.net

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git

S:	Maintained

drivers/net/bnx2x_main.c

+9 −1
Original line number Diff line number Diff line
@@ -8637,6 +8637,14 @@ static int bnx2x_nway_reset(struct net_device *dev) 
	return 0;

}



static u32

bnx2x_get_link(struct net_device *dev)

{

	struct bnx2x *bp = netdev_priv(dev);



	return bp->link_vars.link_up;

}



static int bnx2x_get_eeprom_len(struct net_device *dev)

{

	struct bnx2x *bp = netdev_priv(dev);
@@ -10034,7 +10042,7 @@ static struct ethtool_ops bnx2x_ethtool_ops = { 
	.get_msglevel		= bnx2x_get_msglevel,

	.set_msglevel		= bnx2x_set_msglevel,

	.nway_reset		= bnx2x_nway_reset,

	.get_link		= ethtool_op_get_link,

	.get_link		= bnx2x_get_link,

	.get_eeprom_len		= bnx2x_get_eeprom_len,

	.get_eeprom		= bnx2x_get_eeprom,

	.set_eeprom		= bnx2x_set_eeprom,

drivers/net/e1000/e1000_main.c

+10 −1
Original line number Diff line number Diff line
@@ -2185,12 +2185,16 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter, 
	/* Free all the Rx ring sk_buffs */

	for (i = 0; i < rx_ring->count; i++) {

		buffer_info = &rx_ring->buffer_info[i];

		if (buffer_info->skb) {

		if (buffer_info->dma) {

			pci_unmap_single(pdev,

					 buffer_info->dma,

					 buffer_info->length,

					 PCI_DMA_FROMDEVICE);

		}



		buffer_info->dma = 0;



		if (buffer_info->skb) {

			dev_kfree_skb(buffer_info->skb);

			buffer_info->skb = NULL;

		}
@@ -4033,6 +4037,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, 
		                 buffer_info->dma,

		                 buffer_info->length,

		                 PCI_DMA_FROMDEVICE);

		buffer_info->dma = 0;



		length = le16_to_cpu(rx_desc->length);

		/* !EOP means multiple descriptors were used to store a single
@@ -4222,6 +4227,7 @@ map_skb: 
			pci_unmap_single(pdev, buffer_info->dma,

					 adapter->rx_buffer_len,

					 PCI_DMA_FROMDEVICE);

			buffer_info->dma = 0;



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

		}
@@ -4817,6 +4823,9 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, 


	netif_device_detach(netdev);



	if (state == pci_channel_io_perm_failure)

		return PCI_ERS_RESULT_DISCONNECT;



	if (netif_running(netdev))

		e1000_down(adapter);

	pci_disable_device(pdev);

drivers/net/e1000e/netdev.c

+3 −0
Original line number Diff line number Diff line
@@ -4785,6 +4785,9 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, 


	netif_device_detach(netdev);



	if (state == pci_channel_io_perm_failure)

		return PCI_ERS_RESULT_DISCONNECT;



	if (netif_running(netdev))

		e1000e_down(adapter);

	pci_disable_device(pdev);

drivers/net/igb/igb_main.c

+9 −5
Original line number Diff line number Diff line
@@ -4549,11 +4549,12 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring, 
		cleaned = true;

		cleaned_count++;



		/* this is the fast path for the non-packet split case */

		if (!adapter->rx_ps_hdr_size) {

			pci_unmap_single(pdev, buffer_info->dma,

					 adapter->rx_buffer_len +

					   NET_IP_ALIGN,

					 adapter->rx_buffer_len,

					 PCI_DMA_FROMDEVICE);

			buffer_info->dma = 0;

			skb_put(skb, length);

			goto send_up;

		}
@@ -4570,8 +4571,9 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring, 


		if (!skb_shinfo(skb)->nr_frags) {

			pci_unmap_single(pdev, buffer_info->dma,

					 adapter->rx_ps_hdr_size + NET_IP_ALIGN,

					 adapter->rx_ps_hdr_size,

					 PCI_DMA_FROMDEVICE);

			buffer_info->dma = 0;

			skb_put(skb, hlen);

		}
@@ -4713,7 +4715,6 @@ static void igb_alloc_rx_buffers_adv(struct igb_ring *rx_ring, 
		bufsz = adapter->rx_ps_hdr_size;

	else

		bufsz = adapter->rx_buffer_len;

	bufsz += NET_IP_ALIGN;



	while (cleaned_count--) {

		rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
@@ -4737,7 +4738,7 @@ static void igb_alloc_rx_buffers_adv(struct igb_ring *rx_ring, 
		}



		if (!buffer_info->skb) {

			skb = netdev_alloc_skb(netdev, bufsz);

			skb = netdev_alloc_skb(netdev, bufsz + NET_IP_ALIGN);

			if (!skb) {

				adapter->alloc_rx_buff_failed++;

				goto no_buffers;
@@ -5338,6 +5339,9 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev, 


	netif_device_detach(netdev);



	if (state == pci_channel_io_perm_failure)

		return PCI_ERS_RESULT_DISCONNECT;



	if (netif_running(netdev))

		igb_down(adapter);

	pci_disable_device(pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE