[net 0/3][pull request] Intel Wired LAN Driver Updates

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Peter P Waskiewicz Jr]

This series contains bugfixes to the igb and e1000e drivers.

The following are changes since commit 36471012e2ae28ca3178f84d4687a2d88a36593e:
  
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net master

Alexander Duyck (1):
  igb: Fix register defines for all non-82575 hardware

Emil Tantilov (2):
  igb: fix panic while dumping packets on Tx hang with IOMMU
  e1000e: fix panic while dumping packets on Tx hang with IOMMU

 drivers/net/ethernet/intel/e1000e/netdev.c  | 36 +++++++++++++++++++++--------
 drivers/net/ethernet/intel/igb/e1000_regs.h |  8 +++++--
 drivers/net/ethernet/intel/igb/igb_main.c   | 19 ++++++++-------
 3 files changed, 41 insertions(+), 22 deletions(-)

-- 
1.7.11.2

[net 1/3] igb: fix panic while dumping packets on Tx hang with IOMMU

[Peter P Waskiewicz Jr]

From: Emil Tantilov <emil.s.tantilov@intel.com>

This patch resolves a "BUG: unable to handle kernel paging request at ..."
oops while dumping packet data. The issue occurs with IOMMU enabled due to
the address provided by phys_to_virt().

This patch avoids phys_to_virt() by making using skb->data and the address
of the pages allocated for Rx.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index b7c2d50..48cc4fb 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -462,10 +462,10 @@ static void igb_dump(struct igb_adapter *adapter)
 				(u64)buffer_info->time_stamp,
 				buffer_info->skb, next_desc);
 
-			if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
+			if (netif_msg_pktdata(adapter) && buffer_info->skb)
 				print_hex_dump(KERN_INFO, "",
 					DUMP_PREFIX_ADDRESS,
-					16, 1, phys_to_virt(buffer_info->dma),
+					16, 1, buffer_info->skb->data,
 					buffer_info->length, true);
 		}
 	}
@@ -547,18 +547,17 @@ rx_ring_summary:
 					(u64)buffer_info->dma,
 					buffer_info->skb, next_desc);
 
-				if (netif_msg_pktdata(adapter)) {
+				if (netif_msg_pktdata(adapter) &&
+				    buffer_info->dma && buffer_info->skb) {
 					print_hex_dump(KERN_INFO, "",
-						DUMP_PREFIX_ADDRESS,
-						16, 1,
-						phys_to_virt(buffer_info->dma),
-						IGB_RX_HDR_LEN, true);
+						  DUMP_PREFIX_ADDRESS,
+						  16, 1, buffer_info->skb->data,
+						  IGB_RX_HDR_LEN, true);
 					print_hex_dump(KERN_INFO, "",
 					  DUMP_PREFIX_ADDRESS,
 					  16, 1,
-					  phys_to_virt(
-					    buffer_info->page_dma +
-					    buffer_info->page_offset),
+					  page_address(buffer_info->page) +
+						      buffer_info->page_offset,
 					  PAGE_SIZE/2, true);
 				}
 			}
-- 
1.7.11.2

[net 2/3] e1000e: fix panic while dumping packets on Tx hang with IOMMU

[Peter P Waskiewicz Jr]

From: Emil Tantilov <emil.s.tantilov@intel.com>

This patch resolves a "BUG: unable to handle kernel paging request at ..."
oops while dumping packet data. The issue occurs with IOMMU enabled due to
the address provided by phys_to_virt().

This patch avoids phys_to_virt() by using skb->data and the address of the
pages allocated for Rx.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 36 +++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 95b2453..46c3b1f 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -178,6 +178,24 @@ static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo)
 	pr_info("%-15s %08x %08x\n", rname, regs[0], regs[1]);
 }
 
+static void e1000e_dump_ps_pages(struct e1000_adapter *adapter,
+				 struct e1000_buffer *bi)
+{
+	int i;
+	struct e1000_ps_page *ps_page;
+
+	for (i = 0; i < adapter->rx_ps_pages; i++) {
+		ps_page = &bi->ps_pages[i];
+
+		if (ps_page->page) {
+			pr_info("packet dump for ps_page %d:\n", i);
+			print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
+				       16, 1, page_address(ps_page->page),
+				       PAGE_SIZE, true);
+		}
+	}
+}
+
 /*
  * e1000e_dump - Print registers, Tx-ring and Rx-ring
  */
@@ -299,10 +317,10 @@ static void e1000e_dump(struct e1000_adapter *adapter)
 			(unsigned long long)buffer_info->time_stamp,
 			buffer_info->skb, next_desc);
 
-		if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
+		if (netif_msg_pktdata(adapter) && buffer_info->skb)
 			print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
-				       16, 1, phys_to_virt(buffer_info->dma),
-				       buffer_info->length, true);
+				       16, 1, buffer_info->skb->data,
+				       buffer_info->skb->len, true);
 	}
 
 	/* Print Rx Ring Summary */
@@ -381,10 +399,8 @@ rx_ring_summary:
 					buffer_info->skb, next_desc);
 
 				if (netif_msg_pktdata(adapter))
-					print_hex_dump(KERN_INFO, "",
-						DUMP_PREFIX_ADDRESS, 16, 1,
-						phys_to_virt(buffer_info->dma),
-						adapter->rx_ps_bsize0, true);
+					e1000e_dump_ps_pages(adapter,
+							     buffer_info);
 			}
 		}
 		break;
@@ -444,12 +460,12 @@ rx_ring_summary:
 					(unsigned long long)buffer_info->dma,
 					buffer_info->skb, next_desc);
 
-				if (netif_msg_pktdata(adapter))
+				if (netif_msg_pktdata(adapter) &&
+				    buffer_info->skb)
 					print_hex_dump(KERN_INFO, "",
 						       DUMP_PREFIX_ADDRESS, 16,
 						       1,
-						       phys_to_virt
-						       (buffer_info->dma),
+						       buffer_info->skb->data,
 						       adapter->rx_buffer_len,
 						       true);
 			}
-- 
1.7.11.2

[net 3/3] igb: Fix register defines for all non-82575 hardware

[Peter P Waskiewicz Jr]

From: Alexander Duyck <alexander.h.duyck@intel.com>

It looks like the register defines for DCA were never updated after going from
82575 to 82576.  This change addresses that by updating the defines.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
---
 drivers/net/ethernet/intel/igb/e1000_regs.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index 10efcd8..28394be 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -156,8 +156,12 @@
 				    : (0x0E018 + ((_n) * 0x40)))
 #define E1000_TXDCTL(_n)  ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) \
 				    : (0x0E028 + ((_n) * 0x40)))
-#define E1000_DCA_TXCTRL(_n) (0x03814 + (_n << 8))
-#define E1000_DCA_RXCTRL(_n) (0x02814 + (_n << 8))
+#define E1000_RXCTL(_n)	  ((_n) < 4 ? (0x02814 + ((_n) * 0x100)) : \
+				      (0x0C014 + ((_n) * 0x40)))
+#define E1000_DCA_RXCTRL(_n)	E1000_RXCTL(_n)
+#define E1000_TXCTL(_n)   ((_n) < 4 ? (0x03814 + ((_n) * 0x100)) : \
+				      (0x0E014 + ((_n) * 0x40)))
+#define E1000_DCA_TXCTRL(_n) E1000_TXCTL(_n)
 #define E1000_TDWBAL(_n)  ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) \
 				    : (0x0E038 + ((_n) * 0x40)))
 #define E1000_TDWBAH(_n)  ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) \
-- 
1.7.11.2

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Thu,  9 Aug 2012 02:39:09 -0700

> This series contains bugfixes to the igb and e1000e drivers.
> 
> The following are changes since commit 36471012e2ae28ca3178f84d4687a2d88a36593e:
>   
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net master
> 
> Alexander Duyck (1):
>   igb: Fix register defines for all non-82575 hardware
> 
> Emil Tantilov (2):
>   igb: fix panic while dumping packets on Tx hang with IOMMU
>   e1000e: fix panic while dumping packets on Tx hang with IOMMU

Pulled, thanks PJ.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series contains updates to net and igb.

John provides a patch against net to be able to walk all upper devices
when bringing a device online where the RTNL lock is held.

Akeem provides a igb fix where WOL was being reported as supported on
some ethernet devices which did not have that capability.

Carolyn provides a igb fix to add a call to dev_close if the queue
reinit fails in order to make it clear to the user that the device is
down.

The following are changes since commit d11a347de3f521af62da25e74156ea39e3774f19:
  be2net: Delete secondary unicast MAC addresses during be_close
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Akeem G Abodunrin (1):
  igb: Fixed Wake On Lan support

Carolyn Wyborny (1):
  igb: Update queue reinit function to call dev_close when init of
    queues fails

John Fastabend (1):
  net: allow netdev_all_upper_get_next_dev_rcu with rtnl lock held

 drivers/net/ethernet/intel/igb/igb_ethtool.c  |  7 +++--
 drivers/net/ethernet/intel/igb/igb_main.c     |  1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  6 ++--
 include/linux/netdevice.h                     |  9 ++++++
 net/core/dev.c                                | 43 ++++++++++++++++++++-------
 5 files changed, 49 insertions(+), 17 deletions(-)

-- 
1.8.3.1

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 27 Mar 2013 04:05:30 -0700

> This series contains updates to e1000, ixgb and e1000e for Christoph.
> 
> Christoph provides 3 patches to resolve missing dma_error_call's to
> provided Intel drivers which did not have this fix.

Pulled, thanks Jeff.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series contains updates to e1000, ixgb and e1000e for Christoph.

Christoph provides 3 patches to resolve missing dma_error_call's to
provided Intel drivers which did not have this fix.

The following are changes since commit b175293ccc98ab84e93d25472d7422b4a897614b:
  
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Christoph Paasch (3):
  e1000: ethtool: Add missing dma_mapping_error-call in
    e1000_setup_desc_rings
  ixgb: Add missing dma_mapping_error-call in ixgb_alloc_rx_buffers
  e1000e: Add missing dma_mapping_error-call in
    e1000_alloc_jumbo_rx_buffers

 drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 14 +++++++++++---
 drivers/net/ethernet/intel/e1000e/netdev.c       |  7 ++++++-
 drivers/net/ethernet/intel/ixgb/ixgb_main.c      |  7 ++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

-- 
1.7.11.7

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu,  7 Mar 2013 03:15:22 -0800

> This series contains updates to e1000e only.
> 
> All three patches come from Konstantin Khlebnikov to resolve power
> management issues.  The first patch removes redundant and unbalanced
> pci_disable_device() from the shutdown function.  The second patch
> removes redundant actions from the driver and fixes the interaction
> with actions in pci-bus runtime power management code.  The third
> and last patch fixes some messages like 'Error reading PHY register'
> and 'Hardware Erorr' and saves several seconds on reboot.
> 
> The following are changes since commit f8af75f3517a24838a36eb5797a1a3e60bf9e276:
>   tun: add a missing nf_reset() in tun_net_xmit()
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Pulled, thanks Jeff.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series contains updates to e1000e only.

All three patches come from Konstantin Khlebnikov to resolve power
management issues.  The first patch removes redundant and unbalanced
pci_disable_device() from the shutdown function.  The second patch
removes redundant actions from the driver and fixes the interaction
with actions in pci-bus runtime power management code.  The third
and last patch fixes some messages like 'Error reading PHY register'
and 'Hardware Erorr' and saves several seconds on reboot.

The following are changes since commit f8af75f3517a24838a36eb5797a1a3e60bf9e276:
  tun: add a missing nf_reset() in tun_net_xmit()
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Konstantin Khlebnikov (3):
  e1000e: fix pci-device enable-counter balance
  e1000e: fix runtime power management transitions
  e1000e: fix accessing to suspended device

 drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +++++
 drivers/net/ethernet/intel/e1000e/netdev.c  | 82 ++++++++---------------------
 2 files changed, 34 insertions(+), 61 deletions(-)

-- 
1.7.11.7

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue,  9 Oct 2012 03:13:29 -0700

> This series contains updates to ixgbe, ixgbevf and e1000e.
> 
> The following are changes since commit 66eef59f22275002f621ff9d951886b513d011b3:
>   net: fix typo in freescale/ucc_geth.c
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master
> 
> Alexander Duyck (1):
>   ixgbe/ixgbevf: Limit maximum jumbo frame size to 9.5K to avoid Tx
>     hangs
> 
> Bruce Allan (1):
>   e1000e: add device IDs for i218
> 
> Greg Rose (1):
>   ixgbevf: Set the netdev number of Tx queues

Pulled but please let's get that multi-month-old e1000e BQL bug fixed.

Thanks.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series contains updates to ixgbe, ixgbevf and e1000e.

The following are changes since commit 66eef59f22275002f621ff9d951886b513d011b3:
  net: fix typo in freescale/ucc_geth.c
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Alexander Duyck (1):
  ixgbe/ixgbevf: Limit maximum jumbo frame size to 9.5K to avoid Tx
    hangs

Bruce Allan (1):
  e1000e: add device IDs for i218

Greg Rose (1):
  ixgbevf: Set the netdev number of Tx queues

 drivers/net/ethernet/intel/e1000e/hw.h            | 2 ++
 drivers/net/ethernet/intel/e1000e/netdev.c        | 2 ++
 drivers/net/ethernet/intel/ixgbe/ixgbe.h          | 2 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h      | 2 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 7 +++++++
 5 files changed, 13 insertions(+), 2 deletions(-)

-- 
1.7.11.4

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Tue,  7 Aug 2012 01:04:14 -0700

> This series contains fixes to the e1000e and igb drivers.
> 
> The following are changes since commit 5d299f3d3c8a2fbc732b1bf03af36333ccec3130:
>   
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net master
> 
> Stefan Assmann (1):
>   igb: add delay to allow igb loopback test to succeed on 8086:10c9
> 
> Tushar Dave (2):
>   e1000e: NIC goes up and immediately goes down
>   e1000e: 82571 Tx Data Corruption during Tx hang recovery

Pulled, thanks a lot.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Peter P Waskiewicz Jr]

This series contains fixes to the e1000e and igb drivers.

The following are changes since commit 5d299f3d3c8a2fbc732b1bf03af36333ccec3130:
  
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net master

Stefan Assmann (1):
  igb: add delay to allow igb loopback test to succeed on 8086:10c9

Tushar Dave (2):
  e1000e: NIC goes up and immediately goes down
  e1000e: 82571 Tx Data Corruption during Tx hang recovery

 drivers/net/ethernet/intel/e1000e/82571.c    | 10 +++++-----
 drivers/net/ethernet/intel/igb/igb_ethtool.c |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
1.7.11.2

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Sat,  4 Aug 2012 03:25:49 -0700

> This series contains various fixes to the igb driver.
> 
> The following are changes since commit ff6e1225957cce9e93b8d84dc240e5a44094d0ec:
>   cris: fix eth_v10.c build error
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net master

Pulled, thanks PJ.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Peter P Waskiewicz Jr]

This series contains various fixes to the igb driver.

The following are changes since commit ff6e1225957cce9e93b8d84dc240e5a44094d0ec:
  cris: fix eth_v10.c build error
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net master

Carolyn Wyborny (1):
  igb: Fix for failure to init on some 82576 devices.

Jesper Juhl (2):
  igb: correct hardware type (i210/i211) check in igb_loopback_test()
  igb: don't break user visible strings over multiple lines in
    igb_ethtool.c

 drivers/net/ethernet/intel/igb/e1000_82575.c |   16 ++++++++--------
 drivers/net/ethernet/intel/igb/igb_ethtool.c |   25 ++++++++++++-------------
 2 files changed, 20 insertions(+), 21 deletions(-)

-- 
1.7.10.4

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 20 Jun 2012 01:44:39 -0700

> This series contains fixes to igb, ixgbe and intel/Kconfig
> 
> The following are changes since commit 2c995ff892313009e336ecc8ec3411022f5b1c39:
>   batman-adv: fix skb->data assignment
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master
> 
> Alexander Duyck (1):
>   ixgbe: Fix memory leak in ixgbe when receiving traffic on DDP enabled
>     rings
> 
> Carolyn Wyborny (2):
>   igb: Fix incorrect RAR address entries for i210/i211 device.
>   Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support.

Pulled, thanks Jeff.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series contains fixes to igb, ixgbe and intel/Kconfig

The following are changes since commit 2c995ff892313009e336ecc8ec3411022f5b1c39:
  batman-adv: fix skb->data assignment
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Alexander Duyck (1):
  ixgbe: Fix memory leak in ixgbe when receiving traffic on DDP enabled
    rings

Carolyn Wyborny (2):
  igb: Fix incorrect RAR address entries for i210/i211 device.
  Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support.

 drivers/net/ethernet/intel/Kconfig            |   10 +++++++---
 drivers/net/ethernet/intel/igb/e1000_82575.c  |    2 --
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

-- 
1.7.10.2

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue,  5 Jun 2012 21:08:52 -0700

> This series contains 2 fixes for ixgbe and a fix for e1000e.
> 
> The following are changes since commit dc5cd894cace7bda4a743487a9f87d59a3f0a095:
>   net/hyperv: Use wait_event on outstanding sends during device removal
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Pulled, thanks Jeff.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series contains 2 fixes for ixgbe and a fix for e1000e.

The following are changes since commit dc5cd894cace7bda4a743487a9f87d59a3f0a095:
  net/hyperv: Use wait_event on outstanding sends during device removal
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Bruce Allan (1):
  e1000e: test for valid check_reset_block function pointer

John Fastabend (2):
  ixgbe: fix_features rxvlan is independent of DCB and needs to be set
  ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled

 drivers/net/ethernet/intel/e1000e/ethtool.c   |    6 ++++--
 drivers/net/ethernet/intel/e1000e/mac.c       |    2 +-
 drivers/net/ethernet/intel/e1000e/netdev.c    |    4 ++--
 drivers/net/ethernet/intel/e1000e/phy.c       |    8 +++++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |   22 ++++++++++------------
 5 files changed, 22 insertions(+), 20 deletions(-)

-- 
1.7.10.2

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series of patches contains fixes for igbvf and ixgbe.

The following are changes since commit 1cebce36d660c83bd1353e41f3e66abd4686f215:
  tcp: fix infinite cwnd in tcp_complete_cwr()
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Alexander Duyck (1):
  ixgbe: Fix a memory leak in IEEE DCB

Shan Wei (1):
  igbvf: fix the bug when initializing the igbvf

Yi Zou (1):
  ixgbe: fix calling skb_put on nonlinear skb assertion bug

 drivers/net/ethernet/intel/igbvf/netdev.c     |    4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c |    1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

-- 
1.7.7.6

Re: [net 0/3][pull request] Intel Wired LAN Driver Updates

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue,  3 Apr 2012 15:28:56 -0700

> This series of patches contains fixes for ixgbe and e1000e.
> 
> The following are changes since commit 01627d968c8b5e2810fe8c417b406b968297c236:
>   Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Pulled, thanks Jeff.

[net 0/3][pull request] Intel Wired LAN Driver Updates

[Jeff Kirsher]

This series of patches contains fixes for ixgbe and e1000e.

The following are changes since commit 01627d968c8b5e2810fe8c417b406b968297c236:
  Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master

Bruce Allan (1):
  e1000e: prevent oops when adapter is being closed and reset
    simultaneously

Matthew Vick (1):
  e1000e: Guarantee descriptor writeback flush success.

Multanen, Eric W (1):
  ixgbe: driver fix for link flap

 drivers/net/ethernet/intel/e1000e/e1000.h       |    6 +
 drivers/net/ethernet/intel/e1000e/netdev.c      |   26 ++++
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c |  164 +++++++++++------------
 3 files changed, 112 insertions(+), 84 deletions(-)

-- 
1.7.7.6