Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf745e88 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6

parents a7ac8fc1 2b642ca5

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2109,6 +2109,7 @@ config E1000 
config E1000E

	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"

	depends on PCI && (!SPARC32 || BROKEN)

	select CRC32

	---help---

	  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit

	  ethernet family of adapters. For PCI or PCI-X e1000 adapters,

drivers/net/igb/e1000_defines.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
/* Management Control */

#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */

#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */

#define E1000_MANC_EN_BMC2OS     0x10000000 /* OSBMC is Enabled or not */

/* Enable Neighbor Discovery Filtering */

#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */

#define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */

drivers/net/igb/e1000_hw.h

+4 −0
Original line number Diff line number Diff line
@@ -248,6 +248,10 @@ struct e1000_hw_stats { 
	u64 scvpc;

	u64 hrmpc;

	u64 doosync;

	u64 o2bgptc;

	u64 o2bspc;

	u64 b2ospc;

	u64 b2ogprc;

};



struct e1000_phy_stats {

drivers/net/igb/e1000_regs.h

+7 −0
Original line number Diff line number Diff line
@@ -328,4 +328,11 @@ 


/* DMA Coalescing registers */

#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */



/* OS2BMC Registers */

#define E1000_B2OSPC    0x08FE0 /* BMC2OS packets sent by BMC */

#define E1000_B2OGPRC   0x04158 /* BMC2OS packets received by host */

#define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */

#define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */



#endif

drivers/net/igb/igb_ethtool.c

+8 −1
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ static const struct igb_stats igb_gstrings_stats[] = { 
	IGB_STAT("tx_smbus", stats.mgptc),

	IGB_STAT("rx_smbus", stats.mgprc),

	IGB_STAT("dropped_smbus", stats.mgpdc),

	IGB_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),

	IGB_STAT("os2bmc_tx_by_bmc", stats.b2ospc),

	IGB_STAT("os2bmc_tx_by_host", stats.o2bspc),

	IGB_STAT("os2bmc_rx_by_host", stats.b2ogprc),

};



#define IGB_NETDEV_STAT(_net_stat) { \
@@ -603,7 +607,10 @@ static void igb_get_regs(struct net_device *netdev, 
	regs_buff[548] = rd32(E1000_TDFT);

	regs_buff[549] = rd32(E1000_TDFHS);

	regs_buff[550] = rd32(E1000_TDFPC);



	regs_buff[551] = adapter->stats.o2bgptc;

	regs_buff[552] = adapter->stats.b2ospc;

	regs_buff[553] = adapter->stats.o2bspc;

	regs_buff[554] = adapter->stats.b2ogprc;

}



static int igb_get_eeprom_len(struct net_device *netdev)