* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-09-05 6:25 Jeff Kirsher
2012-09-05 6:25 ` [net-next 1/4] igb: Add loopback test support for i210 Jeff Kirsher
` (4 more replies)
0 siblings, 5 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-05 6:25 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb and ixgbe.
The following are changes since commit 600e177920df936d03b807780ca92c662af98990:
net: Providing protocol type via system.sockprotoname xattr of /proc/PID/fd entries
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Akeem G. Abodunrin (1):
igb: Supported and Advertised Pause Frame
Carolyn Wyborny (1):
igb: Add loopback test support for i210
Eliezer Tamir (1):
ixgbe: remove old init remnant
Eric Dumazet (1):
igb: reduce Rx header size
drivers/net/ethernet/intel/igb/igb.h | 4 +-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 72 +++++++++++++--------------
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 --
3 files changed, 36 insertions(+), 45 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 1/4] igb: Add loopback test support for i210
2012-09-05 6:25 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-09-05 6:25 ` Jeff Kirsher
2012-09-05 6:25 ` [net-next 2/4] igb: reduce Rx header size Jeff Kirsher
` (3 subsequent siblings)
4 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-05 6:25 UTC (permalink / raw)
To: davem; +Cc: Carolyn Wyborny, netdev, gospo, sassmann, Jeff Kirsher
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Early release of i210 devices had the loopback test of the ethtool
self-test disabled. This patch enables the loopback test for i210 devices.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@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/igb/igb_ethtool.c | 51 +++++++++-------------------
1 file changed, 16 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index be02168..c4def55 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1511,33 +1511,22 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
u32 ctrl_reg = 0;
- u16 phy_reg = 0;
hw->mac.autoneg = false;
- switch (hw->phy.type) {
- case e1000_phy_m88:
- /* Auto-MDI/MDIX Off */
- igb_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
- /* reset to update Auto-MDI/MDIX */
- igb_write_phy_reg(hw, PHY_CONTROL, 0x9140);
- /* autoneg off */
- igb_write_phy_reg(hw, PHY_CONTROL, 0x8140);
- break;
- case e1000_phy_82580:
- /* enable MII loopback */
- igb_write_phy_reg(hw, I82580_PHY_LBK_CTRL, 0x8041);
- break;
- case e1000_phy_i210:
- /* set loopback speed in PHY */
- igb_read_phy_reg(hw, (GS40G_PAGE_SELECT & GS40G_PAGE_2),
- &phy_reg);
- phy_reg |= GS40G_MAC_SPEED_1G;
- igb_write_phy_reg(hw, (GS40G_PAGE_SELECT & GS40G_PAGE_2),
- phy_reg);
- ctrl_reg = rd32(E1000_CTRL_EXT);
- default:
- break;
+ if (hw->phy.type == e1000_phy_m88) {
+ if (hw->phy.id != I210_I_PHY_ID) {
+ /* Auto-MDI/MDIX Off */
+ igb_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
+ /* reset to update Auto-MDI/MDIX */
+ igb_write_phy_reg(hw, PHY_CONTROL, 0x9140);
+ /* autoneg off */
+ igb_write_phy_reg(hw, PHY_CONTROL, 0x8140);
+ } else {
+ /* force 1000, set loopback */
+ igb_write_phy_reg(hw, I347AT4_PAGE_SELECT, 0);
+ igb_write_phy_reg(hw, PHY_CONTROL, 0x4140);
+ }
}
/* add small delay to avoid loopback test failure */
@@ -1555,7 +1544,7 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
E1000_CTRL_FD | /* Force Duplex to FULL */
E1000_CTRL_SLU); /* Set link up enable bit */
- if ((hw->phy.type == e1000_phy_m88) || (hw->phy.type == e1000_phy_i210))
+ if (hw->phy.type == e1000_phy_m88)
ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
wr32(E1000_CTRL, ctrl_reg);
@@ -1563,11 +1552,10 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
/* Disable the receiver on the PHY so when a cable is plugged in, the
* PHY does not begin to autoneg when a cable is reconnected to the NIC.
*/
- if ((hw->phy.type == e1000_phy_m88) || (hw->phy.type == e1000_phy_i210))
+ if (hw->phy.type == e1000_phy_m88)
igb_phy_disable_receiver(adapter);
- udelay(500);
-
+ mdelay(500);
return 0;
}
@@ -1827,13 +1815,6 @@ static int igb_loopback_test(struct igb_adapter *adapter, u64 *data)
*data = 0;
goto out;
}
- if ((adapter->hw.mac.type == e1000_i210)
- || (adapter->hw.mac.type == e1000_i211)) {
- dev_err(&adapter->pdev->dev,
- "Loopback test not supported on this part at this time.\n");
- *data = 0;
- goto out;
- }
*data = igb_setup_desc_rings(adapter);
if (*data)
goto out;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [net-next 2/4] igb: reduce Rx header size
2012-09-05 6:25 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-09-05 6:25 ` [net-next 1/4] igb: Add loopback test support for i210 Jeff Kirsher
@ 2012-09-05 6:25 ` Jeff Kirsher
2012-09-05 6:25 ` [net-next 3/4] igb: Supported and Advertised Pause Frame Jeff Kirsher
` (2 subsequent siblings)
4 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-05 6:25 UTC (permalink / raw)
To: davem
Cc: Eric Dumazet, netdev, gospo, sassmann, Alexander Duyck, Jeff Kirsher
From: Eric Dumazet <edumazet@google.com>
Reduce skb truesize by 256 bytes.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index 9e572dd..0c9f62c 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -131,9 +131,9 @@ struct vf_data_storage {
#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
/* Supported Rx Buffer Sizes */
-#define IGB_RXBUFFER_512 512
+#define IGB_RXBUFFER_256 256
#define IGB_RXBUFFER_16384 16384
-#define IGB_RX_HDR_LEN IGB_RXBUFFER_512
+#define IGB_RX_HDR_LEN IGB_RXBUFFER_256
/* How many Tx Descriptors do we need to call netif_wake_queue ? */
#define IGB_TX_QUEUE_WAKE 16
--
1.7.11.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [net-next 3/4] igb: Supported and Advertised Pause Frame
2012-09-05 6:25 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-09-05 6:25 ` [net-next 1/4] igb: Add loopback test support for i210 Jeff Kirsher
2012-09-05 6:25 ` [net-next 2/4] igb: reduce Rx header size Jeff Kirsher
@ 2012-09-05 6:25 ` Jeff Kirsher
2012-09-05 6:25 ` [net-next 4/4] ixgbe: remove old init remnant Jeff Kirsher
2012-09-05 19:10 ` [net-next 0/4][pull request] Intel Wired LAN Driver Updates David Miller
4 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-05 6:25 UTC (permalink / raw)
To: davem; +Cc: Akeem G. Abodunrin, netdev, gospo, sassmann, Jeff Kirsher
From: "Akeem G. Abodunrin" <akeem.g.abodunrin@intel.com>
This patch add ethtool supports for Supported and Advertised Pause Frame,
based on Adapter Flow Control settings.
Signed-off-by: Akeem G. Abodunrin <akeem.g.abodunrin@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/igb/igb_ethtool.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index c4def55..a294441 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -148,9 +148,9 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
SUPPORTED_100baseT_Full |
SUPPORTED_1000baseT_Full|
SUPPORTED_Autoneg |
- SUPPORTED_TP);
- ecmd->advertising = (ADVERTISED_TP |
- ADVERTISED_Pause);
+ SUPPORTED_TP |
+ SUPPORTED_Pause);
+ ecmd->advertising = ADVERTISED_TP;
if (hw->mac.autoneg == 1) {
ecmd->advertising |= ADVERTISED_Autoneg;
@@ -158,6 +158,21 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
ecmd->advertising |= hw->phy.autoneg_advertised;
}
+ if (hw->mac.autoneg != 1)
+ ecmd->advertising &= ~(ADVERTISED_Pause |
+ ADVERTISED_Asym_Pause);
+
+ if (hw->fc.requested_mode == e1000_fc_full)
+ ecmd->advertising |= ADVERTISED_Pause;
+ else if (hw->fc.requested_mode == e1000_fc_rx_pause)
+ ecmd->advertising |= (ADVERTISED_Pause |
+ ADVERTISED_Asym_Pause);
+ else if (hw->fc.requested_mode == e1000_fc_tx_pause)
+ ecmd->advertising |= ADVERTISED_Asym_Pause;
+ else
+ ecmd->advertising &= ~(ADVERTISED_Pause |
+ ADVERTISED_Asym_Pause);
+
ecmd->port = PORT_TP;
ecmd->phy_address = hw->phy.addr;
} else {
--
1.7.11.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [net-next 4/4] ixgbe: remove old init remnant
2012-09-05 6:25 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (2 preceding siblings ...)
2012-09-05 6:25 ` [net-next 3/4] igb: Supported and Advertised Pause Frame Jeff Kirsher
@ 2012-09-05 6:25 ` Jeff Kirsher
2012-09-05 19:10 ` [net-next 0/4][pull request] Intel Wired LAN Driver Updates David Miller
4 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-05 6:25 UTC (permalink / raw)
To: davem; +Cc: Eliezer Tamir, netdev, gospo, sassmann, Jeff Kirsher
From: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Remove a for loop that does nothing in ixgbe_probe().
This is a remnant from when we had IO bars (compare to the ixgb code).
Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index fa0d6e1..1cbb34f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7169,11 +7169,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
goto err_ioremap;
}
- for (i = 1; i <= 5; i++) {
- if (pci_resource_len(pdev, i) == 0)
- continue;
- }
-
netdev->netdev_ops = &ixgbe_netdev_ops;
ixgbe_set_ethtool_ops(netdev);
netdev->watchdog_timeo = 5 * HZ;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-09-05 6:25 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (3 preceding siblings ...)
2012-09-05 6:25 ` [net-next 4/4] ixgbe: remove old init remnant Jeff Kirsher
@ 2012-09-05 19:10 ` David Miller
4 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-09-05 19:10 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 4 Sep 2012 23:25:46 -0700
> This series contains updates to igb and ixgbe.
>
> The following are changes since commit 600e177920df936d03b807780ca92c662af98990:
> net: Providing protocol type via system.sockprotoname xattr of /proc/PID/fd entries
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-09-19 6:03 ` Jeff Kirsher
@ 2012-09-19 6:19 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-09-19 6:19 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 18 Sep 2012 23:03:55 -0700
> Do not pull, it appears there will be changes to patch 04 of the series,
> I will be sending a v2 of the series once John gets patch 04 fixed up.
Ok.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-09-19 4:31 Jeff Kirsher
@ 2012-09-19 6:03 ` Jeff Kirsher
2012-09-19 6:19 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-19 6:03 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
On Tue, 2012-09-18 at 21:31 -0700, Jeff Kirsher wrote:
> This series contains updates to igb and ixgbevf.
>
> The following are changes since commit adccff34de1ef81564b7e6c436f762e7a1caf807:
> net/tipc/name_table.c: Remove unecessary semicolon
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Akeem G. Abodunrin (1):
> igb: Support to enable EEE on all eee_supported devices
>
> Alexander Duyck (2):
> igb: Remove artificial restriction on RQDPC stat reading
> ixgbevf: Add support for VF API negotiation
>
> John Fastabend (1):
> ixgbevf: scheduling while atomic in reset hw path
>
> drivers/net/ethernet/intel/igb/e1000_82575.c | 17 +++++++---
> drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +-
> drivers/net/ethernet/intel/igb/e1000_regs.h | 1 +
> drivers/net/ethernet/intel/igb/igb_main.c | 8 +++--
> drivers/net/ethernet/intel/ixgbevf/defines.h | 1 +
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 23 +++++++++++++
> drivers/net/ethernet/intel/ixgbevf/mbx.h | 21 ++++++++++--
> drivers/net/ethernet/intel/ixgbevf/vf.c | 39 ++++++++++++++++++++++-
> drivers/net/ethernet/intel/ixgbevf/vf.h | 3 ++
> 9 files changed, 105 insertions(+), 11 deletions(-)
>
Dave,
Do not pull, it appears there will be changes to patch 04 of the series,
I will be sending a v2 of the series once John gets patch 04 fixed up.
Cheers,
Jeff
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-09-19 4:31 Jeff Kirsher
2012-09-19 6:03 ` Jeff Kirsher
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-09-19 4:31 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb and ixgbevf.
The following are changes since commit adccff34de1ef81564b7e6c436f762e7a1caf807:
net/tipc/name_table.c: Remove unecessary semicolon
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Akeem G. Abodunrin (1):
igb: Support to enable EEE on all eee_supported devices
Alexander Duyck (2):
igb: Remove artificial restriction on RQDPC stat reading
ixgbevf: Add support for VF API negotiation
John Fastabend (1):
ixgbevf: scheduling while atomic in reset hw path
drivers/net/ethernet/intel/igb/e1000_82575.c | 17 +++++++---
drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +-
drivers/net/ethernet/intel/igb/e1000_regs.h | 1 +
drivers/net/ethernet/intel/igb/igb_main.c | 8 +++--
drivers/net/ethernet/intel/ixgbevf/defines.h | 1 +
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 23 +++++++++++++
drivers/net/ethernet/intel/ixgbevf/mbx.h | 21 ++++++++++--
drivers/net/ethernet/intel/ixgbevf/vf.c | 39 ++++++++++++++++++++++-
drivers/net/ethernet/intel/ixgbevf/vf.h | 3 ++
9 files changed, 105 insertions(+), 11 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-17 11:27 Jeff Kirsher
2012-05-17 11:51 ` Jeff Kirsher
@ 2012-05-17 19:12 ` David Miller
1 sibling, 0 replies; 23+ messages in thread
From: David Miller @ 2012-05-17 19:12 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 17 May 2012 04:27:46 -0700
> This series of patches contains updates for e1000, e1000e and igb.
>
> The following are changes since commit dc6b9b78234fecdc6d2ca5e1629185718202bcf5:
> net: include/net/sock.h cleanup
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-17 11:27 Jeff Kirsher
@ 2012-05-17 11:51 ` Jeff Kirsher
2012-05-17 19:12 ` David Miller
1 sibling, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:51 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
On Thu, 2012-05-17 at 04:27 -0700, Jeff Kirsher wrote:
> This series of patches contains updates for e1000, e1000e and igb.
>
> The following are changes since commit dc6b9b78234fecdc6d2ca5e1629185718202bcf5:
> net: include/net/sock.h cleanup
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Bruce Allan (1):
> e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
>
> Matthew Vick (1):
> igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC.
>
> Sebastian Andrzej Siewior (2):
> e1000: remove workaround for Errata 23 from jumbo alloc
> e1000: look in the page and not in skb->data for the last byte
>
> drivers/net/ethernet/intel/e1000/e1000_main.c | 30 ++++--------------------
> drivers/net/ethernet/intel/e1000e/defines.h | 2 +-
> drivers/net/ethernet/intel/igb/e1000_defines.h | 2 +
> drivers/net/ethernet/intel/igb/igb_main.c | 3 ++
> 4 files changed, 11 insertions(+), 26 deletions(-)
>
v2 of the series will be coming.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-05-17 11:27 Jeff Kirsher
2012-05-17 11:51 ` Jeff Kirsher
2012-05-17 19:12 ` David Miller
0 siblings, 2 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:27 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains updates for e1000, e1000e and igb.
The following are changes since commit dc6b9b78234fecdc6d2ca5e1629185718202bcf5:
net: include/net/sock.h cleanup
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (1):
e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
Matthew Vick (1):
igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC.
Sebastian Andrzej Siewior (2):
e1000: remove workaround for Errata 23 from jumbo alloc
e1000: look in the page and not in skb->data for the last byte
drivers/net/ethernet/intel/e1000/e1000_main.c | 30 ++++--------------------
drivers/net/ethernet/intel/e1000e/defines.h | 2 +-
drivers/net/ethernet/intel/igb/e1000_defines.h | 2 +
drivers/net/ethernet/intel/igb/igb_main.c | 3 ++
4 files changed, 11 insertions(+), 26 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-07 7:12 ` Jeff Kirsher
@ 2012-05-07 16:33 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-05-07 16:33 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 07 May 2012 00:12:58 -0700
> On Sun, 2012-05-06 at 13:25 -0400, David Miller wrote:
>> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sat, 5 May 2012 05:38:09 -0700
>>
>> > This series of patches contains updates for e1000e and ixgbe.
>> >
>> > NOTE- The ixgbe patch can and probably should be applied to
>> > David Miller's net tree as well.
>> >
>> > The following are changes since commit bd14b1b2e29bd6812597f896dde06eaf7c6d2f24:
>> > tcp: be more strict before accepting ECN negociation
>> > and are available in the git repository at:
>> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>>
>> No new changes there?
>>
>> [davem@drr net-next]$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>> From git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
>> * branch master -> FETCH_HEAD
>> Already up-to-date.
>
> Sorry Dave, I thought I had pushed the changes but it appears I did not.
> I have rectified that and now my net-next tree contains the four
> patches.
That looks better, pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-06 17:25 ` David Miller
@ 2012-05-07 7:12 ` Jeff Kirsher
2012-05-07 16:33 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-05-07 7:12 UTC (permalink / raw)
To: David Miller; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
On Sun, 2012-05-06 at 13:25 -0400, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat, 5 May 2012 05:38:09 -0700
>
> > This series of patches contains updates for e1000e and ixgbe.
> >
> > NOTE- The ixgbe patch can and probably should be applied to
> > David Miller's net tree as well.
> >
> > The following are changes since commit bd14b1b2e29bd6812597f896dde06eaf7c6d2f24:
> > tcp: be more strict before accepting ECN negociation
> > and are available in the git repository at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> No new changes there?
>
> [davem@drr net-next]$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
> From git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
> * branch master -> FETCH_HEAD
> Already up-to-date.
Sorry Dave, I thought I had pushed the changes but it appears I did not.
I have rectified that and now my net-next tree contains the four
patches.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-05 12:38 Jeff Kirsher
@ 2012-05-06 17:25 ` David Miller
2012-05-07 7:12 ` Jeff Kirsher
0 siblings, 1 reply; 23+ messages in thread
From: David Miller @ 2012-05-06 17:25 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 5 May 2012 05:38:09 -0700
> This series of patches contains updates for e1000e and ixgbe.
>
> NOTE- The ixgbe patch can and probably should be applied to
> David Miller's net tree as well.
>
> The following are changes since commit bd14b1b2e29bd6812597f896dde06eaf7c6d2f24:
> tcp: be more strict before accepting ECN negociation
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
No new changes there?
[davem@drr net-next]$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>From git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
* branch master -> FETCH_HEAD
Already up-to-date.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-05-05 12:38 Jeff Kirsher
2012-05-06 17:25 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-05-05 12:38 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains updates for e1000e and ixgbe.
NOTE- The ixgbe patch can and probably should be applied to
David Miller's net tree as well.
The following are changes since commit bd14b1b2e29bd6812597f896dde06eaf7c6d2f24:
tcp: be more strict before accepting ECN negociation
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (2):
e1000e: enable forced master/slave on 82577
e1000e: increase version number
John Fastabend (1):
ixgbe: dcb: IEEE PFC stats and reset logic incorrect
Richard Alpe (1):
e1000e: clear REQ and GNT in EECD (82571 && 82572)
drivers/net/ethernet/intel/e1000e/82571.c | 12 ++++-
drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 71 ++++++++++++++--------
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 7 ++
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++-
5 files changed, 69 insertions(+), 29 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-03-03 2:26 Jeff Kirsher
@ 2012-03-03 19:53 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2012-03-03 19:53 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 2 Mar 2012 18:26:23 -0800
> This series of patches contains fixes e100 and DCB (ixgbe, bnx2x).
>
> The following are changes since commit b4017c5368f992fb8fb3a2545a0977082c6664e4:
> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Ben Greear (2):
> e100: Fix rx-over-length statistics.
> e100: Show short v/s long rx length errors in ethtool stats.
>
> John Fastabend (2):
> ixgbe: dcb: check setup_tc return codes
> net: dcb: getnumtcs()/setnumtcs() should return an int
Pulled, thanks.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-03-03 2:24 Jeff Kirsher
@ 2012-03-03 2:27 ` Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2012-03-03 2:27 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]
On Fri, 2012-03-02 at 18:24 -0800, Jeff Kirsher wrote:
> This series of patches contains fixes e100 and DCB (ixgbe, bnx2x).
>
> The following are changes since commit b4017c5368f992fb8fb3a2545a0977082c6664e4:
> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Ben Greear (2):
> e100: Fix rx-over-length statistics.
> e100: Show short v/s long rx length errors in ethtool stats.
>
> John Fastabend (2):
> ixgbe: dcb: check setup_tc return codes
> net: dcb: getnumtcs()/setnumtcs() should return an int
>
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +-
> drivers/net/ethernet/intel/e100.c | 8 +++++-
> drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 30 +++++++++++++++-------
> include/net/dcbnl.h | 4 +-
> 4 files changed, 31 insertions(+), 15 deletions(-)
>
Please disregard this first pull request, patches from a previous pull
request were sent accidentally.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-03-03 2:26 Jeff Kirsher
2012-03-03 19:53 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-03-03 2:26 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains fixes e100 and DCB (ixgbe, bnx2x).
The following are changes since commit b4017c5368f992fb8fb3a2545a0977082c6664e4:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Ben Greear (2):
e100: Fix rx-over-length statistics.
e100: Show short v/s long rx length errors in ethtool stats.
John Fastabend (2):
ixgbe: dcb: check setup_tc return codes
net: dcb: getnumtcs()/setnumtcs() should return an int
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +-
drivers/net/ethernet/intel/e100.c | 8 +++++-
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 30 +++++++++++++++-------
include/net/dcbnl.h | 4 +-
4 files changed, 31 insertions(+), 15 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-03-03 2:24 Jeff Kirsher
2012-03-03 2:27 ` Jeff Kirsher
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2012-03-03 2:24 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains fixes e100 and DCB (ixgbe, bnx2x).
The following are changes since commit b4017c5368f992fb8fb3a2545a0977082c6664e4:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Ben Greear (2):
e100: Fix rx-over-length statistics.
e100: Show short v/s long rx length errors in ethtool stats.
John Fastabend (2):
ixgbe: dcb: check setup_tc return codes
net: dcb: getnumtcs()/setnumtcs() should return an int
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +-
drivers/net/ethernet/intel/e100.c | 8 +++++-
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 30 +++++++++++++++-------
include/net/dcbnl.h | 4 +-
4 files changed, 31 insertions(+), 15 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2011-01-24 8:19 ` Jeff Kirsher
@ 2011-01-24 21:02 ` David Miller
0 siblings, 0 replies; 23+ messages in thread
From: David Miller @ 2011-01-24 21:02 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, bphilips
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 24 Jan 2011 00:19:30 -0800
> On Sat, Jan 22, 2011 at 03:56, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>> The following series contains cleanups for e1000e and addition support
>> for the i340 adapter in igb.
>>
>> The following are changes since commit bb134d2298b49f50cf6d9388410fba96272905dc:
>> net: netif_setup_tc() is static
>>
>> and are available in the git repository at:
>> master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 master
>>
>> Bruce Allan (2):
>> e1000e: reduce scope of some variables, remove unnecessary ones
>> e1000e: Use kmemdup rather than duplicating its implementation
>>
>> Carolyn Wyborny (1):
>> igb: Add support for i340 Quad Port Fiber Adapter
>>
>> Jeff Kirsher (1):
>> e1000e: convert to stats64
>>
>
> I have updated my tree to include Flavio's Signed-off-by on the following patch:
>
> e1000e: convert to stats64
Pulled, thanks a lot Jeff.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2011-01-22 11:56 Jeff Kirsher
@ 2011-01-24 8:19 ` Jeff Kirsher
2011-01-24 21:02 ` David Miller
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2011-01-24 8:19 UTC (permalink / raw)
To: David Miller; +Cc: Jeff Kirsher, netdev, gospo, bphilips
On Sat, Jan 22, 2011 at 03:56, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> The following series contains cleanups for e1000e and addition support
> for the i340 adapter in igb.
>
> The following are changes since commit bb134d2298b49f50cf6d9388410fba96272905dc:
> net: netif_setup_tc() is static
>
> and are available in the git repository at:
> master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 master
>
> Bruce Allan (2):
> e1000e: reduce scope of some variables, remove unnecessary ones
> e1000e: Use kmemdup rather than duplicating its implementation
>
> Carolyn Wyborny (1):
> igb: Add support for i340 Quad Port Fiber Adapter
>
> Jeff Kirsher (1):
> e1000e: convert to stats64
>
I have updated my tree to include Flavio's Signed-off-by on the following patch:
e1000e: convert to stats64
--
Cheers,
Jeff
^ permalink raw reply [flat|nested] 23+ messages in thread
* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2011-01-22 11:56 Jeff Kirsher
2011-01-24 8:19 ` Jeff Kirsher
0 siblings, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2011-01-22 11:56 UTC (permalink / raw)
To: David Miller, davem; +Cc: Jeff Kirsher, netdev, gospo, bphilips
The following series contains cleanups for e1000e and addition support
for the i340 adapter in igb.
The following are changes since commit bb134d2298b49f50cf6d9388410fba96272905dc:
net: netif_setup_tc() is static
and are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 master
Bruce Allan (2):
e1000e: reduce scope of some variables, remove unnecessary ones
e1000e: Use kmemdup rather than duplicating its implementation
Carolyn Wyborny (1):
igb: Add support for i340 Quad Port Fiber Adapter
Jeff Kirsher (1):
e1000e: convert to stats64
drivers/net/e1000e/e1000.h | 5 ++-
drivers/net/e1000e/ethtool.c | 52 ++++++++-----------
drivers/net/e1000e/ich8lan.c | 3 +-
drivers/net/e1000e/lib.c | 4 +-
drivers/net/e1000e/netdev.c | 117 +++++++++++++++++++++++++++-------------
drivers/net/e1000e/phy.c | 8 ++--
drivers/net/igb/e1000_82575.c | 1 +
drivers/net/igb/e1000_hw.h | 1 +
drivers/net/igb/igb_main.c | 1 +
9 files changed, 116 insertions(+), 76 deletions(-)
--
1.7.3.4
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2012-09-19 6:19 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-05 6:25 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-09-05 6:25 ` [net-next 1/4] igb: Add loopback test support for i210 Jeff Kirsher
2012-09-05 6:25 ` [net-next 2/4] igb: reduce Rx header size Jeff Kirsher
2012-09-05 6:25 ` [net-next 3/4] igb: Supported and Advertised Pause Frame Jeff Kirsher
2012-09-05 6:25 ` [net-next 4/4] ixgbe: remove old init remnant Jeff Kirsher
2012-09-05 19:10 ` [net-next 0/4][pull request] Intel Wired LAN Driver Updates David Miller
-- strict thread matches above, loose matches on Subject: below --
2012-09-19 4:31 Jeff Kirsher
2012-09-19 6:03 ` Jeff Kirsher
2012-09-19 6:19 ` David Miller
2012-05-17 11:27 Jeff Kirsher
2012-05-17 11:51 ` Jeff Kirsher
2012-05-17 19:12 ` David Miller
2012-05-05 12:38 Jeff Kirsher
2012-05-06 17:25 ` David Miller
2012-05-07 7:12 ` Jeff Kirsher
2012-05-07 16:33 ` David Miller
2012-03-03 2:26 Jeff Kirsher
2012-03-03 19:53 ` David Miller
2012-03-03 2:24 Jeff Kirsher
2012-03-03 2:27 ` Jeff Kirsher
2011-01-22 11:56 Jeff Kirsher
2011-01-24 8:19 ` Jeff Kirsher
2011-01-24 21:02 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.