further net driver updates for .28
Subsystems (11)
PATCH 1/1 further net driver updates for .28
Please pull from 'davem-next' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-next
to receive the following updates:
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- arch/arm/mach-loki/lb88rc8480-setup.c | 2 +- arch/arm/mach-mv78xx0/common.c | 6 +- arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 8 +- arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- arch/arm/mach-orion5x/dns323-setup.c | 2 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +- arch/arm/mach-orion5x/mss2-setup.c | 2 +- arch/arm/mach-orion5x/mv2120-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +- arch/arm/mach-orion5x/ts78xx-setup.c | 3 +- arch/arm/mach-orion5x/tsx09-common.c | 2 +- arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +- arch/powerpc/sysdev/mv64x60_dev.c | 6 +- drivers/net/Kconfig | 13 +- drivers/net/atl1e/atl1e_hw.c | 6 +- drivers/net/atlx/atl2.c | 4 +- drivers/net/bonding/bonding.h | 8 + drivers/net/e1000/e1000.h | 17 - drivers/net/e1000/e1000_main.c | 416 +-------- drivers/net/e1000e/ich8lan.c | 2 + drivers/net/e1000e/netdev.c | 6 +- drivers/net/enic/enic.h | 3 +- drivers/net/enic/enic_main.c | 195 ++-- drivers/net/forcedeth.c | 2 +- drivers/net/fs_enet/fs_enet-main.c | 22 +- drivers/net/fs_enet/fs_enet.h | 2 - drivers/net/fs_enet/mac-fcc.c | 12 - drivers/net/fs_enet/mac-fec.c | 30 - drivers/net/fs_enet/mac-scc.c | 26 - drivers/net/gianfar_mii.c | 18 +- drivers/net/ibm_newemac/Kconfig | 2 +- drivers/net/mv643xx_eth.c | 1438 +++++++++++++------------- drivers/net/ne.c | 272 +++-- drivers/net/phy/mdio_bus.c | 89 +- drivers/net/r6040.c | 2 +- drivers/net/sb1250-mac.c | 12 +- drivers/s390/net/qeth_core_main.c | 4 +- drivers/s390/net/qeth_l2_main.c | 14 +- drivers/s390/net/qeth_l3_main.c | 8 +- include/linux/mv643xx_eth.h | 13 +- include/linux/phy.h | 2 + 47 files changed, 1145 insertions(+), 1546 deletions(-)
Andy Fleming (1):
gianfar: free/iounmap memory after an error in mii bus initialization
Ayaz Abdulla (1):
forcedeth fix: take phy out of reset during power up
Ben Dooks (1):
drivers/net/bonding: sparse fixes for exported tables
Brandeburg, Jesse (1):
e1000: remove unused Kconfig option for disabling packet split
Bruce Allan (1):
e1000e: remove failed request for sw/fw/hw flag
David Fries (1):
ne.c: fix rmmod, platform driver improvements
Florian Fainelli (1):
r6040: fix wrong assignment in r6040_free_txbufs
Frans Pop (1):
e1000e: avoid duplicated output of device name in kernel warning
Jay Cliburn (1):
atl2: add tx bytes statistic
Jie Yang (1):
atl1e: remove the unneeded (struct atl1e_adapter *)
Kumar Gala (2):
netdev: drop CONFIG_PPC_MERGE from Kconfig
fs-enet: remove code associated with !CONFIG_PPC_MERGE
Lennert Buytenhek (28):
mv643xx_eth: fix 'netdev_priv(dev) == dev->priv' assumption
mv643xx_eth: fix receive buffer DMA unmapping
mv643xx_eth: get rid of IRQF_SAMPLE_RANDOM
mv643xx_eth: get rid of modulo operations
mv643xx_eth: switch ->phy_lock from a spinlock to a mutex
mv643xx_eth: use the SMI done interrupt to wait for SMI access completion
mv643xx_eth: make napi unconditional
mv643xx_eth: get rid of receive-side locking
mv643xx_eth: get rid of compile-time configurable transmit checksumming
mv643xx_eth: require contiguous receive and transmit queue numbering
mv643xx_eth: smi sharing is a per-unit property, not a per-port one
mv643xx_eth: remove force_phy_addr field
mv643xx_eth: get rid of netif_{stop,wake}_queue() calls on link down/up
mv643xx_eth: delete unused and uninteresting interrupt source mask bits
mv643xx_eth: transmit multiqueue support
mv643xx_eth: move all work to the napi poll handler
mv643xx_eth: switch to netif tx queue lock, get rid of private spinlock
mv643xx_eth: avoid dropping tx lock during transmit reclaim
mv643xx_eth: replace array of skbs awaiting transmit completion with a queue
mv643xx_eth: shrink default receive and transmit queue sizes
mv643xx_eth: avoid reading ->byte_cnt twice during receive processing
mv643xx_eth: add support for chips without transmit bandwidth control
mv643xx_eth: fix receive checksumming
mv643xx_eth: deal with unexpected ethernet header sizes
mv643xx_eth: enforce frequent hardware statistics polling
phylib: allow incremental scanning of an mii bus
mv643xx_eth: convert to phylib
mv643xx_eth: bump version to 1.4
Scott Feldman (4):
enic: Don't indicate IPv6 pkts using soft-LRO
enic: fixes for review items from Ben Hutchings
enic: Bug fix: Free MSI intr with correct data handle
enic: bug fix: don't set netdev->name too early
Trent Piepho (1):
gianfar: Fix error in mdio reset timeout
Ursula Braun (2):
qeth: use firmware MAC-address for layer2 hsi-devices
qeth: avoid qeth recovery problems
Weiwei Wang (1):
[netdrvr] convert sbmac tx to spin_lock_irqsave to prevent early IRQ enable
arch/arm/mach-kirkwood/db88f6281-bp-setup.c +1 -1
@@ -25,7 +25,7 @@#include "common.h" static struct mv643xx_eth_platform_data db88f6281_ge00_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };static struct mv_sata_platform_data db88f6281_sata_data = {
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +1 -1
@@ -30,7 +30,7 @@#define RD88F6192_GPIO_USB_VBUS 10static struct mv643xx_eth_platform_data rd88f6192_ge00_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };static struct mv_sata_platform_data rd88f6192_sata_data = {
arch/arm/mach-kirkwood/rd88f6281-setup.c +1 -1
@@ -69,7 +69,7 @@ static struct platform_device rd88f6281_nand_flash = { };static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , .speed =SPEED_1000 , .duplex =DUPLEX_FULL , };
arch/arm/mach-loki/lb88rc8480-setup.c +1 -1
@@ -67,7 +67,7 @@ static struct platform_device lb88rc8480_boot_flash = { };static struct mv643xx_eth_platform_data lb88rc8480_ge0_data = { - .phy_addr =1 , + .phy_addr =MV643XX_ETH_PHY_ADDR (1 ), .mac_addr = {0x00 ,0x50 ,0x43 ,0x11 ,0x22 ,0x33 }, };
arch/arm/mach-mv78xx0/common.c +3 -3
@@ -330,6 +330,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = { .t_clk =0 , .dram = &mv78xx0_mbus_dram_info, + .shared_smi = &mv78xx0_ge00_shared, };static struct resource mv78xx0_ge01_shared_resources[] = {
@@ -370,7 +371,6 @@ static struct platform_device mv78xx0_ge01 = {void __init mv78xx0_ge01_init (struct mv643xx_eth_platform_data *eth_data) { eth_data->shared = &mv78xx0_ge01_shared; - eth_data->shared_smi = &mv78xx0_ge00_shared; mv78xx0_ge01.dev.platform_data = eth_data;platform_device_register (&mv78xx0_ge01_shared);
@@ -384,6 +384,7 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = { .t_clk =0 , .dram = &mv78xx0_mbus_dram_info, + .shared_smi = &mv78xx0_ge00_shared, };static struct resource mv78xx0_ge10_shared_resources[] = {
@@ -424,7 +425,6 @@ static struct platform_device mv78xx0_ge10 = {void __init mv78xx0_ge10_init (struct mv643xx_eth_platform_data *eth_data) { eth_data->shared = &mv78xx0_ge10_shared; - eth_data->shared_smi = &mv78xx0_ge00_shared; mv78xx0_ge10.dev.platform_data = eth_data;platform_device_register (&mv78xx0_ge10_shared);
@@ -438,6 +438,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = { .t_clk =0 , .dram = &mv78xx0_mbus_dram_info, + .shared_smi = &mv78xx0_ge00_shared, };static struct resource mv78xx0_ge11_shared_resources[] = {
@@ -478,7 +479,6 @@ static struct platform_device mv78xx0_ge11 = {void __init mv78xx0_ge11_init (struct mv643xx_eth_platform_data *eth_data) { eth_data->shared = &mv78xx0_ge11_shared; - eth_data->shared_smi = &mv78xx0_ge00_shared; mv78xx0_ge11.dev.platform_data = eth_data;platform_device_register (&mv78xx0_ge11_shared);
arch/arm/mach-mv78xx0/db78x00-bp-setup.c +4 -4
@@ -19,19 +19,19 @@#include "common.h" static struct mv643xx_eth_platform_data db78x00_ge00_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };static struct mv643xx_eth_platform_data db78x00_ge01_data = { - .phy_addr =9 , + .phy_addr =MV643XX_ETH_PHY_ADDR (9 ), };static struct mv643xx_eth_platform_data db78x00_ge10_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , };static struct mv643xx_eth_platform_data db78x00_ge11_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , };static struct mv_sata_platform_data db78x00_sata_data = {
arch/arm/mach-orion5x/db88f5281-setup.c +1 -1
@@ -285,7 +285,7 @@ subsys_initcall(db88f5281_pci_init);* Ethernet ****************************************************************************/ static struct mv643xx_eth_platform_data db88f5281_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };/*****************************************************************************
arch/arm/mach-orion5x/dns323-setup.c +1 -1
@@ -79,7 +79,7 @@ subsys_initcall(dns323_pci_init);*/ static struct mv643xx_eth_platform_data dns323_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };/****************************************************************************
arch/arm/mach-orion5x/kurobox_pro-setup.c +1 -1
@@ -161,7 +161,7 @@ subsys_initcall(kurobox_pro_pci_init);****************************************************************************/ static struct mv643xx_eth_platform_data kurobox_pro_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };/*****************************************************************************
arch/arm/mach-orion5x/mss2-setup.c +1 -1
@@ -109,7 +109,7 @@ subsys_initcall(mss2_pci_init);****************************************************************************/ static struct mv643xx_eth_platform_data mss2_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };/*****************************************************************************
arch/arm/mach-orion5x/mv2120-setup.c +1 -1
@@ -39,7 +39,7 @@* Ethernet ****************************************************************************/ static struct mv643xx_eth_platform_data mv2120_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };static struct mv_sata_platform_data mv2120_sata_data = {
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c +1 -1
@@ -88,7 +88,7 @@ static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = { };static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , .speed =SPEED_1000 , .duplex =DUPLEX_FULL , };
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +1 -1
@@ -89,7 +89,7 @@ static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = { };static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , .speed =SPEED_1000 , .duplex =DUPLEX_FULL , };
arch/arm/mach-orion5x/rd88f5182-setup.c +1 -1
@@ -221,7 +221,7 @@ subsys_initcall(rd88f5182_pci_init);****************************************************************************/ static struct mv643xx_eth_platform_data rd88f5182_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };/*****************************************************************************
arch/arm/mach-orion5x/ts78xx-setup.c +1 -2
@@ -103,8 +103,7 @@ static struct platform_device ts78xx_nor_boot_flash = {* Ethernet ****************************************************************************/ static struct mv643xx_eth_platform_data ts78xx_eth_data = { - .phy_addr =0 , - .force_phy_addr =1 , + .phy_addr =MV643XX_ETH_PHY_ADDR (0 ), };/*****************************************************************************
arch/arm/mach-orion5x/tsx09-common.c +1 -1
@@ -48,7 +48,7 @@ void qnap_tsx09_power_off(void)****************************************************************************/ struct mv643xx_eth_platform_data qnap_tsx09_eth_data = { - .phy_addr =8 , + .phy_addr =MV643XX_ETH_PHY_ADDR (8 ), };static int __init qnap_tsx09_parse_hex_nibble (char n)
arch/arm/mach-orion5x/wnr854t-setup.c +1 -1
@@ -92,7 +92,7 @@ static struct platform_device wnr854t_nor_flash = { };static struct mv643xx_eth_platform_data wnr854t_eth_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , .speed =SPEED_1000 , .duplex =DUPLEX_FULL , };
arch/arm/mach-orion5x/wrt350n-v2-setup.c +1 -1
@@ -100,7 +100,7 @@ static struct platform_device wrt350n_v2_nor_flash = { };static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = { - .phy_addr =-1 , + .phy_addr =MV643XX_ETH_PHY_NONE , .speed =SPEED_1000 , .duplex =DUPLEX_FULL , };
arch/powerpc/sysdev/mv64x60_dev.c +2 -4
@@ -293,10 +293,8 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id,return -ENODEV ; prop =of_get_property (phy,"reg" ,NULL ); -if (prop) { - pdata.force_phy_addr =1 ; - pdata.phy_addr = *prop; - } +if (prop) + pdata.phy_addr =MV643XX_ETH_PHY_ADDR (*prop);of_node_put (phy);
drivers/net/Kconfig +2 -11
@@ -1813,7 +1813,7 @@ config FEC2 config FEC_MPC52xx tristate "MPC52xx FEC driver" - depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC + depends on PPC_MPC52xx && PPC_BESTCOMM_FEC select CRC32 select PHYLIB ---help---
@@ -1938,15 +1938,6 @@ config E1000 To compile this driver as a module, choose M here. The module will be called e1000. -config E1000_DISABLE_PACKET_SPLIT - bool "Disable Packet Split for PCI express adapters" - depends on E1000 - help - Say Y here if you want to use the legacy receive path for PCI express - hardware. - - If in doubt, say N. - config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" depends on PCI && (!SPARC32 || BROKEN)
@@ -2274,7 +2265,7 @@ config UGETH_TX_ON_DEMAND config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION - select MII + select PHYLIB help This driver supports the gigabit ethernet MACs in the Marvell Discovery PPC/MIPS chipset family (MV643XX) and
drivers/net/atl1e/atl1e_hw.c +3 -3
@@ -397,7 +397,7 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)*/ int atl1e_phy_commit (struct atl1e_hw *hw) { -struct atl1e_adapter *adapter = (struct atl1e_adapter *)hw->adapter; +struct atl1e_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;int ret_val;u16 phy_data;
@@ -431,7 +431,7 @@ int atl1e_phy_commit(struct atl1e_hw *hw)int atl1e_phy_init (struct atl1e_hw *hw) { -struct atl1e_adapter *adapter = (struct atl1e_adapter *)hw->adapter; +struct atl1e_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;s32 ret_val;u16 phy_val;
@@ -525,7 +525,7 @@ int atl1e_phy_init(struct atl1e_hw *hw)*/ int atl1e_reset_hw (struct atl1e_hw *hw) { -struct atl1e_adapter *adapter = (struct atl1e_adapter *)hw->adapter; +struct atl1e_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;u32 idle_status_data =0 ;
drivers/net/atlx/atl2.c +3 -1
@@ -522,8 +522,10 @@ static void atl2_intr_tx(struct atl2_adapter *adapter)atomic_set (&adapter->txd_read_ptr, (int )txd_read_ptr);/* tx statistics: */ -if (txs->ok) +if (txs->ok) { + adapter->net_stats.tx_bytes += txs->pkt_size; adapter->net_stats.tx_packets++; + }else adapter->net_stats.tx_errors++;
drivers/net/bonding/bonding.h +8 -0
@@ -333,5 +333,13 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active);void bond_register_arp (struct bonding *);void bond_unregister_arp (struct bonding *); +/* exported from bond_main.c */ +extern struct list_head bond_dev_list; +extern struct bond_parm_tbl bond_lacp_tbl[]; +extern struct bond_parm_tbl bond_mode_tbl[]; +extern struct bond_parm_tbl xmit_hashtype_tbl[]; +extern struct bond_parm_tbl arp_validate_tbl[]; +extern struct bond_parm_tbl fail_over_mac_tbl[]; +#endif /* _LINUX_BONDING_H */
drivers/net/e1000/e1000.h +0 -17
@@ -155,8 +155,6 @@ do { \#endif #define E1000_MNG_VLAN_NONE (-1) -/* Number of packet split data buffers (not including the header buffer) */ -#define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1)/* wrapper around a pointer to a socket buffer, * so a DMA handle can be stored along with the buffer */
@@ -168,14 +166,6 @@ struct e1000_buffer {u16 next_to_watch; }; -struct e1000_ps_page { -struct page *ps_page[PS_PAGE_BUFFERS ]; -}; - -struct e1000_ps_page_dma { -u64 ps_page_dma[PS_PAGE_BUFFERS ]; -}; -struct e1000_tx_ring {/* pointer to the descriptor ring memory */ void *desc;
@@ -213,9 +203,6 @@ struct e1000_rx_ring {unsigned int next_to_clean;/* array of buffer information structs */ struct e1000_buffer *buffer_info; -/* arrays of page information for packet split */ -struct e1000_ps_page *ps_page; -struct e1000_ps_page_dma *ps_page_dma;/* cpu for rx queue */ int cpu;
@@ -228,8 +215,6 @@ struct e1000_rx_ring { ((((R )->next_to_clean > (R )->next_to_use) \ ? 0 : (R)->count) + (R)->next_to_clean - (R)->next_to_use - 1) -#define E1000_RX_DESC_PS (R , i) \ - (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))#define E1000_RX_DESC_EXT (R , i) \ (&(((union e1000_rx_desc_extended *)((R).desc))[i]))#define E1000_GET_DESC (R , i, type) (&(((struct type *)((R).desc))[i]))
@@ -311,10 +296,8 @@ struct e1000_adapter {u32 rx_int_delay;u32 rx_abs_int_delay;bool rx_csum; -unsigned int rx_ps_pages;u32 gorcl;u64 gorcl_old; -u16 rx_ps_bsize0;/* OS defined structs */ struct net_device *netdev;
drivers/net/e1000/e1000_main.c +9 -407
508 lines not on this page · raw message
drivers/net/e1000e/ich8lan.c +2 -0
@@ -398,6 +398,8 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)if (!timeout) {hw_dbg (hw,"FW or HW has locked the resource for too long.\n" ); + extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG ; +ew32 (EXTCNF_CTRL , extcnf_ctrl);return -E1000_ERR_CONFIG ; }
drivers/net/e1000e/netdev.c +4 -2
@@ -4671,13 +4671,15 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter) ret_val =e1000_read_nvm (hw,NVM_INIT_CONTROL2_REG ,1 , &buf);if (!(le16_to_cpu (buf) & (1 <<0 ))) {/* Deep Smart Power Down (DSPD) */ -e_warn ("Warning: detected DSPD enabled in EEPROM\n" ); +dev_warn (&adapter->pdev->dev, +"Warning: detected DSPD enabled in EEPROM\n" ); } ret_val =e1000_read_nvm (hw,NVM_INIT_3GIO_3 ,1 , &buf);if (le16_to_cpu (buf) & (3 <<2 )) {/* ASPM enable */ -e_warn ("Warning: detected ASPM enabled in EEPROM\n" ); +dev_warn (&adapter->pdev->dev, +"Warning: detected ASPM enabled in EEPROM\n" ); } }
drivers/net/enic/enic.h +1 -2
@@ -33,7 +33,7 @@#define DRV_NAME "enic"#define DRV_DESCRIPTION "Cisco 10G Ethernet Driver" -#define DRV_VERSION "0.0.1.18163.472" +#define DRV_VERSION "0.0.1-18163.472-k1"#define DRV_COPYRIGHT "Copyright 2008 Cisco Systems, Inc"#define PFX DRV_NAME ": "
@@ -75,7 +75,6 @@ struct enic {struct vnic_enet_config config;struct vnic_dev_bar bar0;struct vnic_dev *vdev; -struct net_device_stats net_stats;struct timer_list notify_timer;struct work_struct reset;struct msix_entry msix_entry[ENIC_MSIX_MAX ];
drivers/net/enic/enic_main.c +90 -105
429 lines not on this page · raw message
drivers/net/forcedeth.c +1 -1
@@ -337,7 +337,7 @@ enum { NvRegMSIXIrqStatus = 0x3f0, NvRegPowerState2 = 0x600, -#define NVREG_POWERSTATE2_POWERUP_MASK 0x0F11 +#define NVREG_POWERSTATE2_POWERUP_MASK 0x0F15#define NVREG_POWERSTATE2_POWERUP_REV_A3 0x0001#define NVREG_POWERSTATE2_PHY_RESET 0x0004 };
drivers/net/fs_enet/fs_enet-main.c +3 -19
@@ -664,23 +664,6 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static int fs_request_irq (struct net_device *dev,int irq,const char *name, -irq_handler_t irqf) -{ -struct fs_enet_private *fep =netdev_priv (dev); - - (*fep->ops->pre_request_irq)(dev, irq); -return request_irq (irq, irqf,IRQF_SHARED , name, dev); -} - -static void fs_free_irq (struct net_device *dev,int irq) -{ -struct fs_enet_private *fep =netdev_priv (dev); - -free_irq (irq, dev); - (*fep->ops->post_free_irq)(dev, irq); -} -static void fs_timeout (struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);
@@ -800,7 +783,8 @@ static int fs_enet_open(struct net_device *dev)napi_enable (&fep->napi);/* Install our interrupt handler. */ - r =fs_request_irq (dev, fep->interrupt,"fs_enet-mac" , fs_enet_interrupt); + r =request_irq (fep->interrupt, fs_enet_interrupt,IRQF_SHARED , +"fs_enet-mac" , dev);if (r !=0 ) { printk(KERN_ERR DRV_MODULE_NAME ": %s Could not allocate FS_ENET IRQ!", dev->name);
@@ -842,7 +826,7 @@ static int fs_enet_close(struct net_device *dev)/* release any irqs */ phy_disconnect (fep->phydev); fep->phydev =NULL ; -fs_free_irq (dev, fep->interrupt); +free_irq (fep->interrupt, dev);return 0 ; }
drivers/net/fs_enet/fs_enet.h +0 -2
@@ -34,8 +34,6 @@ struct fs_ops {void (*adjust_link)(struct net_device *dev);void (*restart)(struct net_device *dev);void (*stop)(struct net_device *dev); -void (*pre_request_irq)(struct net_device *dev,int irq); -void (*post_free_irq)(struct net_device *dev,int irq);void (*napi_clear_rx_event)(struct net_device *dev);void (*napi_enable_rx)(struct net_device *dev);void (*napi_disable_rx)(struct net_device *dev);
drivers/net/fs_enet/mac-fcc.c +0 -12
@@ -421,16 +421,6 @@ static void stop(struct net_device *dev)fs_cleanup_bds (dev); } -static void pre_request_irq (struct net_device *dev,int irq) -{ -/* nothing */ -} - -static void post_free_irq (struct net_device *dev,int irq) -{ -/* nothing */ -} -static void napi_clear_rx_event (struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);
@@ -540,8 +530,6 @@ const struct fs_ops fs_fcc_ops = { .set_multicast_list = set_multicast_list, .restart = restart, .stop = stop, - .pre_request_irq = pre_request_irq, - .post_free_irq = post_free_irq, .napi_clear_rx_event = napi_clear_rx_event, .napi_enable_rx = napi_enable_rx, .napi_disable_rx = napi_disable_rx,
drivers/net/fs_enet/mac-fec.c +0 -30
@@ -313,11 +313,7 @@ static void restart(struct net_device *dev)* Clear any outstanding interrupt. */ FW (fecp, ievent,0xffc0 ); -#ifndef CONFIG_PPC_MERGE -FW (fecp, ivec, (fep->interrupt /2 ) <<29 ); -#else FW (fecp, ivec, (virq_to_hw (fep->interrupt) /2 ) <<29 ); -#endif /* * adjust to speed (only for DUET & RMII)
@@ -413,30 +409,6 @@ static void stop(struct net_device *dev) } } -static void pre_request_irq (struct net_device *dev,int irq) -{ -#ifndef CONFIG_PPC_MERGE -immap_t *immap = fs_enet_immap; -u32 siel; - -/* SIU interrupt */ -if (irq >=SIU_IRQ0 && irq <SIU_LEVEL7 ) { - - siel =in_be32 (&immap->im_siu_conf.sc_siel); -if ((irq &1 ) ==0 ) - siel |= (0x80000000 >> irq); -else - siel &= ~(0x80000000 >> (irq & ~1 )); -out_be32 (&immap->im_siu_conf.sc_siel, siel); - } -#endif -} - -static void post_free_irq (struct net_device *dev,int irq) -{ -/* nothing */ -} -static void napi_clear_rx_event (struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);
@@ -529,8 +501,6 @@ const struct fs_ops fs_fec_ops = { .set_multicast_list = set_multicast_list, .restart = restart, .stop = stop, - .pre_request_irq = pre_request_irq, - .post_free_irq = post_free_irq, .napi_clear_rx_event = napi_clear_rx_event, .napi_enable_rx = napi_enable_rx, .napi_disable_rx = napi_disable_rx,
drivers/net/fs_enet/mac-scc.c +0 -26
@@ -377,30 +377,6 @@ static void stop(struct net_device *dev)fs_cleanup_bds (dev); } -static void pre_request_irq (struct net_device *dev,int irq) -{ -#ifndef CONFIG_PPC_MERGE -immap_t *immap = fs_enet_immap; -u32 siel; - -/* SIU interrupt */ -if (irq >=SIU_IRQ0 && irq <SIU_LEVEL7 ) { - - siel =in_be32 (&immap->im_siu_conf.sc_siel); -if ((irq &1 ) ==0 ) - siel |= (0x80000000 >> irq); -else - siel &= ~(0x80000000 >> (irq & ~1 )); -out_be32 (&immap->im_siu_conf.sc_siel, siel); - } -#endif -} - -static void post_free_irq (struct net_device *dev,int irq) -{ -/* nothing */ -} -static void napi_clear_rx_event (struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);
@@ -494,8 +470,6 @@ const struct fs_ops fs_scc_ops = { .set_multicast_list = set_multicast_list, .restart = restart, .stop = stop, - .pre_request_irq = pre_request_irq, - .post_free_irq = post_free_irq, .napi_clear_rx_event = napi_clear_rx_event, .napi_enable_rx = napi_enable_rx, .napi_disable_rx = napi_disable_rx,
drivers/net/gianfar_mii.c +10 -8
@@ -136,12 +136,12 @@ static int gfar_mdio_reset(struct mii_bus *bus)/* Wait until the bus is free */ while ((gfar_read (®s->miimind) &MIIMIND_BUSY ) && - timeout--) + --timeout)cpu_relax ();mutex_unlock (&bus->mdio_lock); -if (timeout <=0 ) { +if (timeout ==0 ) {printk (KERN_ERR "%s: The MII Bus is stuck!\n" , bus->name);return -EBUSY ;
@@ -211,19 +211,21 @@ static int gfar_mdio_probe(struct device *dev)gfar_write (&enet_regs->tbipa,0 );for (i =PHY_MAX_ADDR ; i >0 ; i--) {u32 phy_id; -int r; - r =get_phy_id (new_bus, i, &phy_id); -if (r) -return r; + err =get_phy_id (new_bus, i, &phy_id); +if (err) + goto bus_register_fail;if (phy_id ==0xffffffff )break ; }/* The bus is full. We don't support using 31 PHYs, sorry */ -if (i ==0 ) -return -EBUSY ; +if (i ==0 ) { + err = -EBUSY ; + + goto bus_register_fail; + }gfar_write (&enet_regs->tbipa, i);
drivers/net/ibm_newemac/Kconfig +1 -1
@@ -1,6 +1,6 @@ config IBM_NEW_EMAC tristate "IBM EMAC Ethernet support" - depends on PPC_DCR && PPC_MERGE + depends on PPC_DCR select CRC32 help This driver supports the IBM EMAC family of Ethernet controllers
drivers/net/mv643xx_eth.c +736 -702
1,474 lines not on this page · raw message
drivers/net/ne.c +164 -108
272 lines not on this page · raw message
drivers/net/phy/mdio_bus.c +48 -41
89 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Miller
maintainerFrom: Jeff Garzik <[email protected]>
Date: Wed, 24 Sep 2008 22:27:22 -0400
Quoted 5 lines
Please pull from 'davem-next' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-next
to receive the following updates:
Pulled and pushed back out to net-next-2.6, thanks Jeff!