* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-06-06 4:08 Jeff Kirsher
2012-06-06 4:08 ` [net 1/3] e1000e: test for valid check_reset_block function pointer Jeff Kirsher
` (3 more replies)
0 siblings, 4 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-06-06 4:08 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 1/3] e1000e: test for valid check_reset_block function pointer
2012-06-06 4:08 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-06-06 4:08 ` Jeff Kirsher
2012-06-06 4:08 ` [net 2/3] ixgbe: fix_features rxvlan is independent of DCB and needs to be set Jeff Kirsher
` (2 subsequent siblings)
3 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-06-06 4:08 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
commit 44abd5c12767a8c567dc4e45fd9aec3b13ca85e0 introduced NULL pointer
dereferences when attempting to access the check_reset_block function
pointer on 8257x and 80003es2lan non-copper devices.
This fix should be applied back through 3.4.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
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 +++++---
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index d863075..905e214 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -258,7 +258,8 @@ static int e1000_set_settings(struct net_device *netdev,
* When SoL/IDER sessions are active, autoneg/speed/duplex
* cannot be changed
*/
- if (hw->phy.ops.check_reset_block(hw)) {
+ if (hw->phy.ops.check_reset_block &&
+ hw->phy.ops.check_reset_block(hw)) {
e_err("Cannot change link characteristics when SoL/IDER is active.\n");
return -EINVAL;
}
@@ -1615,7 +1616,8 @@ static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
* PHY loopback cannot be performed if SoL/IDER
* sessions are active
*/
- if (hw->phy.ops.check_reset_block(hw)) {
+ if (hw->phy.ops.check_reset_block &&
+ hw->phy.ops.check_reset_block(hw)) {
e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
*data = 0;
goto out;
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 026e8b3..a134399 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -709,7 +709,7 @@ s32 e1000e_setup_link_generic(struct e1000_hw *hw)
* In the case of the phy reset being blocked, we already have a link.
* We do not need to set it up again.
*/
- if (hw->phy.ops.check_reset_block(hw))
+ if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
return 0;
/*
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a4b0435..31d37a2 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6237,7 +6237,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
adapter->hw.phy.ms_type = e1000_ms_hw_default;
}
- if (hw->phy.ops.check_reset_block(hw))
+ if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
e_info("PHY reset is blocked due to SOL/IDER session.\n");
/* Set initial default active device features */
@@ -6404,7 +6404,7 @@ err_register:
if (!(adapter->flags & FLAG_HAS_AMT))
e1000e_release_hw_control(adapter);
err_eeprom:
- if (!hw->phy.ops.check_reset_block(hw))
+ if (hw->phy.ops.check_reset_block && !hw->phy.ops.check_reset_block(hw))
e1000_phy_hw_reset(&adapter->hw);
err_hw_init:
kfree(adapter->tx_ring);
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 0334d01..b860d4f 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -2155,9 +2155,11 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
s32 ret_val;
u32 ctrl;
- ret_val = phy->ops.check_reset_block(hw);
- if (ret_val)
- return 0;
+ if (phy->ops.check_reset_block) {
+ ret_val = phy->ops.check_reset_block(hw);
+ if (ret_val)
+ return 0;
+ }
ret_val = phy->ops.acquire(hw);
if (ret_val)
--
1.7.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [net 2/3] ixgbe: fix_features rxvlan is independent of DCB and needs to be set
2012-06-06 4:08 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-06-06 4:08 ` [net 1/3] e1000e: test for valid check_reset_block function pointer Jeff Kirsher
@ 2012-06-06 4:08 ` Jeff Kirsher
2012-06-06 4:08 ` [net 3/3] ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled Jeff Kirsher
2012-06-06 16:00 ` [net 0/3][pull request] Intel Wired LAN Driver Updates David Miller
3 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-06-06 4:08 UTC (permalink / raw)
To: davem
Cc: John Fastabend, netdev, gospo, sassmann, Alexander Duyck,
Jeff Kirsher
From: John Fastabend <john.r.fastabend@intel.com>
DCB can be used independent of if RX VLAN stripping is enabled
or disabled so remove erroneous check.
Also enable or disable VLAN stripping when features are applied so
hardware and feature flags are in sync.
CC: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index bf20457..b8b2087 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3607,10 +3607,6 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
if (hw->mac.type == ixgbe_mac_82598EB)
netif_set_gso_max_size(adapter->netdev, 32768);
-
- /* Enable VLAN tag insert/strip */
- adapter->netdev->features |= NETIF_F_HW_VLAN_RX;
-
hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
#ifdef IXGBE_FCOE
@@ -6701,11 +6697,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
{
struct ixgbe_adapter *adapter = netdev_priv(netdev);
-#ifdef CONFIG_DCB
- if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
- features &= ~NETIF_F_HW_VLAN_RX;
-#endif
-
/* return error if RXHASH is being enabled when RSS is not supported */
if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
features &= ~NETIF_F_RXHASH;
@@ -6718,7 +6709,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
features &= ~NETIF_F_LRO;
-
return features;
}
@@ -6766,6 +6756,11 @@ static int ixgbe_set_features(struct net_device *netdev,
need_reset = true;
}
+ if (features & NETIF_F_HW_VLAN_RX)
+ ixgbe_vlan_strip_enable(adapter);
+ else
+ ixgbe_vlan_strip_disable(adapter);
+
if (changed & NETIF_F_RXALL)
need_reset = true;
--
1.7.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [net 3/3] ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled
2012-06-06 4:08 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-06-06 4:08 ` [net 1/3] e1000e: test for valid check_reset_block function pointer Jeff Kirsher
2012-06-06 4:08 ` [net 2/3] ixgbe: fix_features rxvlan is independent of DCB and needs to be set Jeff Kirsher
@ 2012-06-06 4:08 ` Jeff Kirsher
2012-06-06 16:00 ` [net 0/3][pull request] Intel Wired LAN Driver Updates David Miller
3 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-06-06 4:08 UTC (permalink / raw)
To: davem; +Cc: John Fastabend, netdev, gospo, sassmann, Jeff Kirsher
From: John Fastabend <john.r.fastabend@intel.com>
The hardware bit IXGBE_RXD_STAT_VP appears to be set even when Rx
stripping is disabled. This results in passing frames up the stack
which do not have the 802.1Q tag stripped but have the tci bits
set as if it was.
Working around this with a check for the feature flag bit. I
would welcome any better ideas or a pointer to exactly which
bits in the hardware register need to be cleared to get the
IXGBE_RXD_STAT_VP bit to be set per data sheet.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index b8b2087..17ad6a3 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1390,6 +1390,8 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
union ixgbe_adv_rx_desc *rx_desc,
struct sk_buff *skb)
{
+ struct net_device *dev = rx_ring->netdev;
+
ixgbe_update_rsc_stats(rx_ring, skb);
ixgbe_rx_hash(rx_ring, rx_desc, skb);
@@ -1401,14 +1403,15 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);
#endif
- if (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
+ if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+ ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
__vlan_hwaccel_put_tag(skb, vid);
}
skb_record_rx_queue(skb, rx_ring->queue_index);
- skb->protocol = eth_type_trans(skb, rx_ring->netdev);
+ skb->protocol = eth_type_trans(skb, dev);
}
static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,
--
1.7.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-06-06 4:08 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (2 preceding siblings ...)
2012-06-06 4:08 ` [net 3/3] ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled Jeff Kirsher
@ 2012-06-06 16:00 ` David Miller
3 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-06-06 16:00 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2013-11-19 15:40 Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2013-11-19 15:40 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2013-03-27 11:05 Jeff Kirsher
2013-03-27 18:10 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2013-03-27 11:05 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2013-03-27 11:05 Jeff Kirsher
@ 2013-03-27 18:10 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2013-03-27 18:10 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2013-03-07 11:15 Jeff Kirsher
2013-03-07 20:19 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2013-03-07 11:15 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, bruce.w.allan
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2013-03-07 11:15 Jeff Kirsher
@ 2013-03-07 20:19 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2013-03-07 20:19 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann, bruce.w.allan
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-10-09 10:13 Jeff Kirsher
2012-10-09 16:51 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-10-09 10:13 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-10-09 10:13 Jeff Kirsher
@ 2012-10-09 16:51 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-10-09 16:51 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-08-09 9:39 Peter P Waskiewicz Jr
2012-08-09 10:42 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Peter P Waskiewicz Jr @ 2012-08-09 9:39 UTC (permalink / raw)
To: davem; +Cc: Peter P Waskiewicz Jr, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-08-09 9:39 Peter P Waskiewicz Jr
@ 2012-08-09 10:42 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-08-09 10:42 UTC (permalink / raw)
To: peter.p.waskiewicz.jr; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-08-07 8:04 Peter P Waskiewicz Jr
2012-08-08 22:42 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Peter P Waskiewicz Jr @ 2012-08-07 8:04 UTC (permalink / raw)
To: davem; +Cc: Peter P Waskiewicz Jr, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-08-07 8:04 Peter P Waskiewicz Jr
@ 2012-08-08 22:42 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-08-08 22:42 UTC (permalink / raw)
To: peter.p.waskiewicz.jr; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-08-04 10:25 Peter P Waskiewicz Jr
2012-08-04 10:37 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Peter P Waskiewicz Jr @ 2012-08-04 10:25 UTC (permalink / raw)
To: davem; +Cc: Peter P Waskiewicz Jr, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-08-04 10:25 Peter P Waskiewicz Jr
@ 2012-08-04 10:37 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-08-04 10:37 UTC (permalink / raw)
To: peter.p.waskiewicz.jr; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-06-20 8:44 Jeff Kirsher
2012-06-20 22:09 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-06-20 8:44 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-06-20 8:44 Jeff Kirsher
@ 2012-06-20 22:09 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-06-20 22:09 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-04-30 23:16 Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-04-30 23:16 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-04-03 22:28 Jeff Kirsher
2012-04-03 22:48 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-04-03 22:28 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net 0/3][pull request] Intel Wired LAN Driver Updates
2012-04-03 22:28 Jeff Kirsher
@ 2012-04-03 22:48 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-04-03 22:48 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
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.
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2013-11-19 15:40 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-06 4:08 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-06-06 4:08 ` [net 1/3] e1000e: test for valid check_reset_block function pointer Jeff Kirsher
2012-06-06 4:08 ` [net 2/3] ixgbe: fix_features rxvlan is independent of DCB and needs to be set Jeff Kirsher
2012-06-06 4:08 ` [net 3/3] ixgbe: IXGBE_RXD_STAT_VP set even with Rx stripping enabled Jeff Kirsher
2012-06-06 16:00 ` [net 0/3][pull request] Intel Wired LAN Driver Updates David Miller
-- strict thread matches above, loose matches on Subject: below --
2013-11-19 15:40 Jeff Kirsher
2013-03-27 11:05 Jeff Kirsher
2013-03-27 18:10 ` David Miller
2013-03-07 11:15 Jeff Kirsher
2013-03-07 20:19 ` David Miller
2012-10-09 10:13 Jeff Kirsher
2012-10-09 16:51 ` David Miller
2012-08-09 9:39 Peter P Waskiewicz Jr
2012-08-09 10:42 ` David Miller
2012-08-07 8:04 Peter P Waskiewicz Jr
2012-08-08 22:42 ` David Miller
2012-08-04 10:25 Peter P Waskiewicz Jr
2012-08-04 10:37 ` David Miller
2012-06-20 8:44 Jeff Kirsher
2012-06-20 22:09 ` David Miller
2012-04-30 23:16 Jeff Kirsher
2012-04-03 22:28 Jeff Kirsher
2012-04-03 22:48 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).