2.6.x net driver updates
Subsystems (5)
PATCH 1/1 2.6.x net driver updates
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
Documentation/networking/bonding.txt | 2 MAINTAINERS | 1 drivers/net/3c503.c | 16 +-- drivers/net/Kconfig | 4 drivers/net/ac3200.c | 16 +-- drivers/net/bonding/bonding.h | 8 - drivers/net/e1000/e1000_param.c | 10 +- drivers/net/e2100.c | 14 +- drivers/net/es3210.c | 14 +- drivers/net/forcedeth.c | 164 +++++++++++++++++++++-------------- drivers/net/gianfar.h | 4 drivers/net/hp-plus.c | 12 +- drivers/net/hp.c | 12 +- drivers/net/ibm_emac/ibm_emac.h | 3 drivers/net/ibm_emac/ibm_emac_core.c | 2 drivers/net/lance.c | 22 ++-- drivers/net/lne390.c | 14 +- drivers/net/mv643xx_eth.c | 2 drivers/net/ne.c | 18 +-- drivers/net/ne2.c | 16 +-- drivers/net/sk98lin/skge.c | 129 ++++++++++++++++----------- drivers/net/smc-ultra.c | 24 ++--- drivers/net/tulip/tulip_core.c | 2 drivers/net/wd.c | 14 +- drivers/net/wireless/ipw2100.c | 5 - net/ieee80211/ieee80211_crypt_wep.c | 61 +++++++++---- net/ieee80211/ieee80211_tx.c | 2 net/ieee80211/ieee80211_wx.c | 2 28 files changed, 341 insertions(+), 252 deletions(-)
Adrian Bunk:
drivers/net/Kconfig: indentation fix
drivers/net/bonding/bonding.h: "extern inline" -> "static inline"
drivers/net/gianfar.h: "extern inline" -> "static inline"Ayaz Abdulla:
forcedeth: TSO fix for large buffers
Christoph Dworzak:
tulip: enable multiport NIC BIOS fixups for x86_64
Dan Williams:
[patch] ipw2100: support WEXT-18 enc_capa v3
Denis Vlasenko:
fix a few "warning: 'cleanup_card' defined but not used"
Eric Paris:
update bonding.txt to not show ip address on slaves
Eugene Surovegin:
PPC44x EMAC driver: disable TX status deferral in half-duplex mode
Franck:
Add MIPS dependency for dm9000 driver
Johannes Berg:
ieee80211: enable hw wep where host has to build IV
Kenji Kaneshige:
e1000: Fix invalid memory reference
Olaf Hering:
remove bouncing mail address of mv643xx_eth maintainer
Stephen Hemminger:
sk98lin: routine called from probe marked __init
sk98lin: not doing high dma properly
sk98lin: error handling on dual port board
sk98lin: use kzalloc
sk98lin: error handling on probe
sk98lin: error handling of pci setup
Documentation/networking/bonding.txt +0 -2
@@ -945,7 +945,6 @@ bond0 Link encap:Ethernet HWaddr 00 collisions:0 txqueuelen:0 eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0 TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0
@@ -953,7 +952,6 @@ eth0 Link encap:Ethernet HWaddr 00 Interrupt:10 Base address:0x1080 eth1 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0 TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0
MAINTAINERS +0 -1
@@ -1697,7 +1697,6 @@ S: Maintained MARVELL MV64340 ETHERNET DRIVER P: Manish Lachwani -M: [email protected] L: [email protected] L: [email protected] S: Supported
drivers/net/3c503.c +8 -8
@@ -148,14 +148,6 @@ el2_pio_probe(struct net_device *dev)return -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -/* NB: el2_close() handles free_irq */ -release_region (dev->base_addr,EL2_IO_EXTENT ); -if (ei_status.mem) -iounmap (ei_status.mem); -} -#ifndef MODULE struct net_device *__init el2_probe (int unit) {
@@ -726,6 +718,14 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +/* NB: el2_close() handles free_irq */ +release_region (dev->base_addr,EL2_IO_EXTENT ); +if (ei_status.mem) +iounmap (ei_status.mem); +} +void cleanup_module (void ) {
drivers/net/Kconfig +2 -2
@@ -129,7 +129,7 @@ config NET_SB1000 If you don't have this card, of course say N. - source "drivers/net/arcnet/Kconfig" +source "drivers/net/arcnet/Kconfig" source "drivers/net/phy/Kconfig"
@@ -844,7 +844,7 @@ config SMC9194 config DM9000 tristate "DM9000 support" - depends on ARM && NET_ETHERNET + depends on (ARM || MIPS) && NET_ETHERNET select CRC32 select MII ---help---
drivers/net/ac3200.c +8 -8
@@ -123,14 +123,6 @@ static int __init do_ac3200_probe(structreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -/* Someday free_irq may be in ac_close_card() */ -free_irq (dev->irq, dev); -release_region (dev->base_addr,AC_IO_EXTENT ); -iounmap (ei_status.mem); -} -#ifndef MODULE struct net_device *__init ac3200_probe (int unit) {
@@ -406,6 +398,14 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +/* Someday free_irq may be in ac_close_card() */ +free_irq (dev->irq, dev); +release_region (dev->base_addr,AC_IO_EXTENT ); +iounmap (ei_status.mem); +} +void cleanup_module (void ) {
drivers/net/bonding/bonding.h +4 -4
@@ -205,7 +205,7 @@ struct bonding {* * Caller must hold bond lock for read */ -extern inline struct slave *bond_get_slave_by_dev (struct bonding *bond,struct net_device *slave_dev) +static inline struct slave *bond_get_slave_by_dev (struct bonding *bond,struct net_device *slave_dev) {struct slave *slave =NULL ;int i;
@@ -219,7 +219,7 @@ extern inline struct slave *bond_get_slareturn slave; } -extern inline struct bonding *bond_get_bond_by_slave (struct slave *slave) +static inline struct bonding *bond_get_bond_by_slave (struct slave *slave) {if (!slave || !slave->dev->master) {return NULL ;
@@ -228,13 +228,13 @@ extern inline struct bonding *bond_get_breturn (struct bonding *)slave->dev->master->priv; } -extern inline void bond_set_slave_inactive_flags (struct slave *slave) +static inline void bond_set_slave_inactive_flags (struct slave *slave) { slave->state =BOND_STATE_BACKUP ; slave->dev->flags |=IFF_NOARP ; } -extern inline void bond_set_slave_active_flags (struct slave *slave) +static inline void bond_set_slave_active_flags (struct slave *slave) { slave->state =BOND_STATE_ACTIVE ; slave->dev->flags &= ~IFF_NOARP ;
drivers/net/e1000/e1000_param.c +7 -3
@@ -545,7 +545,7 @@ e1000_check_fiber_options(struct e1000_astatic void __devinit e1000_check_copper_options (struct e1000_adapter *adapter) { -int speed, dplx; +int speed, dplx, an;int bd = adapter->bd_number; {/* Speed */
@@ -641,8 +641,12 @@ e1000_check_copper_options(struct e1000_ .p = an_list }} }; -int an = AutoNeg[bd]; -e1000_validate_option (&an, &opt, adapter); +if (num_AutoNeg > bd) { + an = AutoNeg[bd]; +e1000_validate_option (&an, &opt, adapter); + }else { + an = opt.def; + } adapter->hw.autoneg_advertised = an; }
drivers/net/e2100.c +7 -7
@@ -140,13 +140,6 @@ static int __init do_e2100_probe(structreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -/* NB: e21_close() handles free_irq */ -iounmap (ei_status.mem); -release_region (dev->base_addr,E21_IO_EXTENT ); -} -#ifndef MODULE struct net_device *__init e2100_probe (int unit) {
@@ -463,6 +456,13 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +/* NB: e21_close() handles free_irq */ +iounmap (ei_status.mem); +release_region (dev->base_addr,E21_IO_EXTENT ); +} +void cleanup_module (void ) {
drivers/net/es3210.c +7 -7
@@ -155,13 +155,6 @@ static int __init do_es_probe(struct netreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -free_irq (dev->irq, dev); -release_region (dev->base_addr,ES_IO_EXTENT ); -iounmap (ei_status.mem); -} -#ifndef MODULE struct net_device *__init es_probe (int unit) {
@@ -456,6 +449,13 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +free_irq (dev->irq, dev); +release_region (dev->base_addr,ES_IO_EXTENT ); +iounmap (ei_status.mem); +} +void cleanup_module (void ) {
drivers/net/forcedeth.c +100 -64
284 lines not on this page · raw message
drivers/net/gianfar.h +2 -2
@@ -718,14 +718,14 @@ struct gfar_private {uint32_t msg_enable; }; -extern inline u32 gfar_read (volatile unsigned *addr) +static inline u32 gfar_read (volatile unsigned *addr) {u32 val; val =in_be32 (addr);return val; } -extern inline void gfar_write (volatile unsigned *addr,u32 val) +static inline void gfar_write (volatile unsigned *addr,u32 val) {out_be32 (addr, val); }
drivers/net/hp-plus.c +6 -6
@@ -138,12 +138,6 @@ static int __init do_hpp_probe(struct nereturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -/* NB: hpp_close() handles free_irq */ -release_region (dev->base_addr -NIC_OFFSET ,HP_IO_EXTENT ); -} -#ifndef MODULE struct net_device *__init hp_plus_probe (int unit) {
@@ -473,6 +467,12 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +/* NB: hpp_close() handles free_irq */ +release_region (dev->base_addr -NIC_OFFSET ,HP_IO_EXTENT ); +} +void cleanup_module (void ) {
drivers/net/hp.c +6 -6
@@ -102,12 +102,6 @@ static int __init do_hp_probe(struct netreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -free_irq (dev->irq, dev); -release_region (dev->base_addr -NIC_OFFSET ,HP_IO_EXTENT ); -} -#ifndef MODULE struct net_device *__init hp_probe (int unit) {
@@ -444,6 +438,12 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +free_irq (dev->irq, dev); +release_region (dev->base_addr -NIC_OFFSET ,HP_IO_EXTENT ); +} +void cleanup_module (void ) {
drivers/net/ibm_emac/ibm_emac.h +2 -1
@@ -110,6 +110,7 @@ struct emac_regs {#define EMAC_MR1_TFS_2K 0x00080000#define EMAC_MR1_TR0_MULT 0x00008000#define EMAC_MR1_JPSM 0x00000000 +#define EMAC_MR1_MWSW_001 0x00000000#define EMAC_MR1_BASE (opb) (EMAC_MR1_TFS_2K | EMAC_MR1_TR0_MULT)#else #define EMAC_MR1_RFS_4K 0x00180000
@@ -130,7 +131,7 @@ struct emac_regs { (freq) <= 83 ? EMAC_MR1_OBCI_83 : \ (freq) <= 100 ? EMAC_MR1_OBCI_100 : EMAC_MR1_OBCI_100P)#define EMAC_MR1_BASE (opb) (EMAC_MR1_TFS_2K | EMAC_MR1_TR | \ - EMAC_MR1_MWSW_001 | EMAC_MR1_OBCI(opb)) + EMAC_MR1_OBCI(opb))#endif /* EMACx_TMR0 */
drivers/net/ibm_emac/ibm_emac_core.c +1 -1
@@ -408,7 +408,7 @@ static int emac_configure(struct ocp_ene/* Mode register */ r =EMAC_MR1_BASE (emac_opb_mhz ()) |EMAC_MR1_VLE |EMAC_MR1_IST ;if (dev->phy.duplex ==DUPLEX_FULL ) - r |=EMAC_MR1_FDE ; + r |=EMAC_MR1_FDE |EMAC_MR1_MWSW_001 ; dev->stop_timeout =STOP_TIMEOUT_10 ;switch (dev->phy.speed) {case SPEED_1000 :
drivers/net/lance.c +11 -11
@@ -309,17 +309,6 @@ static void lance_tx_timeout (struct net -static void cleanup_card (struct net_device *dev) -{ -struct lance_private *lp = dev->priv; -if (dev->dma !=4 ) -free_dma (dev->dma); -release_region (dev->base_addr,LANCE_TOTAL_SIZE ); -kfree (lp->tx_bounce_buffs); -kfree ((void *)lp->rx_buffs); -kfree (lp); -} -#ifdef MODULE #define MAX_CARDS 8/* Max number of interfaces (cards) per module */
@@ -367,6 +356,17 @@ int init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +struct lance_private *lp = dev->priv; +if (dev->dma !=4 ) +free_dma (dev->dma); +release_region (dev->base_addr,LANCE_TOTAL_SIZE ); +kfree (lp->tx_bounce_buffs); +kfree ((void *)lp->rx_buffs); +kfree (lp); +} +void cleanup_module (void ) {int this_dev;
drivers/net/lne390.c +7 -7
@@ -145,13 +145,6 @@ static int __init do_lne390_probe(structreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -free_irq (dev->irq, dev); -release_region (dev->base_addr,LNE390_IO_EXTENT ); -iounmap (ei_status.mem); -} -#ifndef MODULE struct net_device *__init lne390_probe (int unit) {
@@ -440,6 +433,13 @@ int init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +free_irq (dev->irq, dev); +release_region (dev->base_addr,LNE390_IO_EXTENT ); +iounmap (ei_status.mem); +} +void cleanup_module (void ) {int this_dev;
drivers/net/mv643xx_eth.c +1 -1
@@ -6,7 +6,7 @@* Copyright (C) 2002 [email protected] * * Copyright (C) 2003 PMC-Sierra, Inc., -* written by Manish Lachwani ([email protected]) +* written by Manish Lachwani * * Copyright (C) 2003 Ralf Baechle <[email protected]> *
drivers/net/ne.c +9 -9
@@ -212,15 +212,6 @@ static int __init do_ne_probe(struct netreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; -if (idev) -pnp_device_detach (idev); -free_irq (dev->irq, dev); -release_region (dev->base_addr,NE_IO_EXTENT ); -} -#ifndef MODULE struct net_device *__init ne_probe (int unit) {
@@ -859,6 +850,15 @@ int init_module(void)return -ENODEV ; } +static void cleanup_card (struct net_device *dev) +{ +struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; +if (idev) +pnp_device_detach (idev); +free_irq (dev->irq, dev); +release_region (dev->base_addr,NE_IO_EXTENT ); +} +void cleanup_module (void ) {int this_dev;
drivers/net/ne2.c +8 -8
@@ -278,14 +278,6 @@ static int __init do_ne2_probe(struct nereturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -mca_mark_as_unused (ei_status.priv); -mca_set_adapter_procfn ( ei_status.priv,NULL ,NULL ); -free_irq (dev->irq, dev); -release_region (dev->base_addr,NE_IO_EXTENT ); -} -#ifndef MODULE struct net_device *__init ne2_probe (int unit) {
@@ -812,6 +804,14 @@ int init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +mca_mark_as_unused (ei_status.priv); +mca_set_adapter_procfn ( ei_status.priv,NULL ,NULL ); +free_irq (dev->irq, dev); +release_region (dev->base_addr,NE_IO_EXTENT ); +} +void cleanup_module (void ) {int this_dev;
drivers/net/sk98lin/skge.c +76 -53
282 lines not on this page · raw message
drivers/net/smc-ultra.c +12 -12
@@ -168,18 +168,6 @@ static int __init do_ultra_probe(structreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -/* NB: ultra_close_card() does free_irq */ -#ifdef __ISAPNP__ -struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; -if (idev) -pnp_device_detach (idev); -#endif -release_region (dev->base_addr -ULTRA_NIC_OFFSET ,ULTRA_IO_EXTENT ); -iounmap (ei_status.mem); -} -#ifndef MODULE struct net_device *__init ultra_probe (int unit) {
@@ -594,6 +582,18 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +/* NB: ultra_close_card() does free_irq */ +#ifdef __ISAPNP__ +struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; +if (idev) +pnp_device_detach (idev); +#endif +release_region (dev->base_addr -ULTRA_NIC_OFFSET ,ULTRA_IO_EXTENT ); +iounmap (ei_status.mem); +} +void cleanup_module (void ) {
drivers/net/tulip/tulip_core.c +1 -1
@@ -1564,7 +1564,7 @@ static int __devinit tulip_init_one (str dev->dev_addr, 6); }#endif -#if defined(__i386__)/* Patch up x86 BIOS bug. */ +#if defined(__i386__) || defined(__x86_64__)/* Patch up x86 BIOS bug. */ if (last_irq) irq = last_irq;#endif
drivers/net/wd.c +7 -7
@@ -127,13 +127,6 @@ static int __init do_wd_probe(struct netreturn -ENODEV ; } -static void cleanup_card (struct net_device *dev) -{ -free_irq (dev->irq, dev); -release_region (dev->base_addr -WD_NIC_OFFSET ,WD_IO_EXTENT ); -iounmap (ei_status.mem); -} -#ifndef MODULE struct net_device *__init wd_probe (int unit) {
@@ -538,6 +531,13 @@ init_module(void)return -ENXIO ; } +static void cleanup_card (struct net_device *dev) +{ +free_irq (dev->irq, dev); +release_region (dev->base_addr -WD_NIC_OFFSET ,WD_IO_EXTENT ); +iounmap (ei_status.mem); +} +void cleanup_module (void ) {
drivers/net/wireless/ipw2100.c +4 -1
@@ -7153,7 +7153,7 @@ static int ipw2100_wx_get_range(struct n/* Set the Wireless Extension versions */ range->we_version_compiled =WIRELESS_EXT ; - range->we_version_source =16 ; + range->we_version_source =18 ;// range->retry_capa; /* What retry options are supported */ // range->retry_flags; /* How to decode max/min retry limit */
@@ -7184,6 +7184,9 @@ static int ipw2100_wx_get_range(struct n IW_EVENT_CAPA_MASK(SIOCGIWAP)); range->event_capa[1 ] =IW_EVENT_CAPA_K_1 ; + range->enc_capa =IW_ENC_CAPA_WPA |IW_ENC_CAPA_WPA2 | +IW_ENC_CAPA_CIPHER_TKIP |IW_ENC_CAPA_CIPHER_CCMP ; +IPW_DEBUG_WX ("GET Range\n" );return 0 ;
net/ieee80211/ieee80211_crypt_wep.c +43 -18
86 lines not on this page · raw message
net/ieee80211/ieee80211_tx.c +1 -1
@@ -288,7 +288,7 @@ int ieee80211_xmit(struct sk_buff *skb,/* Determine total amount of storage required for TXB packets */ bytes = skb->len +SNAP_SIZE +sizeof (u16); -if (host_encrypt) +if (host_encrypt || host_build_iv) fc =IEEE80211_FTYPE_DATA |IEEE80211_STYPE_DATA |IEEE80211_FCTL_PROTECTED ;else
net/ieee80211/ieee80211_wx.c +1 -1
@@ -284,7 +284,7 @@ int ieee80211_wx_set_encode(struct ieee8 };int i, key, key_provided, len;struct ieee80211_crypt_data **crypt; -int host_crypto = ieee->host_encrypt || ieee->host_decrypt; +int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv;IEEE80211_DEBUG_WX ("SET_ENCODE\n" );