net driver updates
Subsystems (3)
PATCH 1/1 net driver updates
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
to receive the following updates:
drivers/net/8139too.c | 40 ++--- drivers/net/hamradio/baycom_epp.c | 13 +-- drivers/net/hamradio/hdlcdrv.c | 13 +-- drivers/net/hamradio/yam.c | 11 +- drivers/net/natsemi.c | 43 +++++- drivers/net/r8169.c | 25 ++- drivers/net/s2io.c | 21 ++- drivers/net/sis190.c | 7 +- drivers/net/skge.c | 9 +- drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/bcm43xx/bcm43xx.h | 8 +- drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 15 ++ drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 1 + drivers/net/wireless/bcm43xx/bcm43xx_main.c | 20 +-- drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 195 ++++++++++------------- drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 13 +- drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | 10 +- drivers/net/wireless/hostap/hostap.h | 3 +- drivers/net/wireless/ipw2100.c | 14 +- drivers/net/wireless/prism54/isl_ioctl.c | 8 +- drivers/net/wireless/prism54/oid_mgt.c | 4 +- drivers/net/wireless/wavelan.c | 14 +- drivers/net/wireless/wavelan.p.h | 3 - drivers/net/wireless/zd1211rw/zd_chip.c | 2 +- include/linux/wireless.h | 4 +- net/ieee80211/softmac/ieee80211softmac_module.c | 13 +-- net/ieee80211/softmac/ieee80211softmac_wx.c | 11 +- 27 files changed, 264 insertions(+), 260 deletions(-)
Ahmed S. Darwish (4):
ipw2100: Use ARRAY_SIZE macro when appropriate
misc-wireless: Use ARRAY_SIZE macro when appropriate
hostap: Use ARRAY_SIZE macro when appropriate
wavelan: Use ARRAY_SIZE macro when appropriate
Dan Williams (1):
prism54: correct assignment of DOT1XENABLE in WE-19 codepaths
Daniel Drake (1):
zd1211rw: Readd zd_addr_t cast
Francois Romieu (4):
r8169: RTNL and flush_scheduled_work deadlock
sis190: RTNL and flush_scheduled_work deadlock 8139too: RTNL and flush_scheduled_work deadlock
s2io: RTNL and flush_scheduled_work deadlock
Ingo van Lil (1):
wireless: fix IW_IS_{GET,SET} comment in wireless.h
Larry Finger (5):
bcm43xx: Janitorial change - remove two unused variables
bcm43xx: Fix for oops on resume
bcm43xx: Fix for 4311 and 02/07/07 specification changes
bcm43xx: OFDM fix for rev 1 cards
ieee80211softmac: Fix setting of initial transmit rates
Mark Brown (2):
natsemi: Add support for using MII port with no PHY
natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards
Michael Buesch (1):
bcm43xx: Ignore ampdu status reports
Ralf Baechle (1):
Replace local random function with random32()
Stephen Hemminger (1):
skge: race with workq and RTNL
drivers/net/8139too.c +17 -23
@@ -1109,6 +1109,8 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)assert (dev !=NULL ); +flush_scheduled_work (); +unregister_netdev (dev);__rtl8139_cleanup_dev (dev);
@@ -1603,18 +1605,21 @@ static void rtl8139_thread (struct work_struct *work)struct net_device *dev = tp->mii.dev;unsigned long thr_delay = next_tick; +rtnl_lock (); + +if (!netif_running (dev)) + goto out_unlock; +if (tp->watchdog_fired) { tp->watchdog_fired =0 ;rtl8139_tx_timeout_task (work); - }else if (rtnl_trylock ()) { -rtl8139_thread_iter (dev, tp, tp->mmio_addr); -rtnl_unlock (); - }else { -/* unlikely race. mitigate with fast poll. */ - thr_delay =HZ /2 ; - } + }else +rtl8139_thread_iter (dev, tp, tp->mmio_addr); -schedule_delayed_work (&tp->thread, thr_delay); +if (tp->have_thread) +schedule_delayed_work (&tp->thread, thr_delay); +out_unlock: +rtnl_unlock (); }static void rtl8139_start_thread (struct rtl8139_private *tp)
@@ -1626,19 +1631,11 @@ static void rtl8139_start_thread(struct rtl8139_private *tp)return ; tp->have_thread =1 ; + tp->watchdog_fired =0 ;schedule_delayed_work (&tp->thread, next_tick); } -static void rtl8139_stop_thread (struct rtl8139_private *tp) -{ -if (tp->have_thread) { -cancel_rearming_delayed_work (&tp->thread); - tp->have_thread =0 ; - }else -flush_scheduled_work (); -} -static inline void rtl8139_tx_clear (struct rtl8139_private *tp) { tp->cur_tx =0 ;
@@ -1696,12 +1693,11 @@ static void rtl8139_tx_timeout (struct net_device *dev) {struct rtl8139_private *tp =netdev_priv (dev); + tp->watchdog_fired =1 ;if (!tp->have_thread) { -INIT_DELAYED_WORK (&tp->thread, rtl8139_tx_timeout_task); +INIT_DELAYED_WORK (&tp->thread, rtl8139_thread);schedule_delayed_work (&tp->thread, next_tick); - }else - tp->watchdog_fired =1 ; - + } }static int rtl8139_start_xmit (struct sk_buff *skb,struct net_device *dev)
@@ -2233,8 +2229,6 @@ static int rtl8139_close (struct net_device *dev)netif_stop_queue (dev); -rtl8139_stop_thread (tp); -if (netif_msg_ifdown (tp))printk (KERN_DEBUG "%s: Shutting down ethercard, status was 0x%4.4x.\n" , dev->name,RTL_R16 (IntrStatus));
drivers/net/hamradio/baycom_epp.c +2 -11
@@ -52,6 +52,7 @@#include <linux/hdlcdrv.h> #include <linux/baycom.h> #include <linux/jiffies.h> +#include <linux/random.h> #include <net/ax25.h> #include <asm/uaccess.h>
@@ -433,16 +434,6 @@ static void encode_hdlc(struct baycom_state *bc)/* ---------------------------------------------------------------------- */ -static unsigned short random_seed; - -static inline unsigned short random_num (void ) -{ - random_seed =28629 * random_seed +157 ; -return random_seed; -} - -/* ---------------------------------------------------------------------- */ -static int transmit (struct baycom_state *bc,int cnt,unsigned char stat) {struct parport *pp = bc->pdev->port;
@@ -464,7 +455,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat)if ((--bc->hdlctx.slotcnt) >0 )return 0 ; bc->hdlctx.slotcnt = bc->ch_params.slottime; -if ((random_num () %256 ) > bc->ch_params.ppersist) +if ((random32 () %256 ) > bc->ch_params.ppersist)return 0 ; } }
drivers/net/hamradio/hdlcdrv.c +2 -11
@@ -56,6 +56,7 @@#include <linux/if_arp.h> #include <linux/skbuff.h> #include <linux/hdlcdrv.h> +#include <linux/random.h> #include <net/ax25.h> #include <asm/uaccess.h>
@@ -371,16 +372,6 @@ static void start_tx(struct net_device *dev, struct hdlcdrv_state *s)/* ---------------------------------------------------------------------- */ -static unsigned short random_seed; - -static inline unsigned short random_num (void ) -{ - random_seed =28629 * random_seed +157 ; -return random_seed; -} - -/* ---------------------------------------------------------------------- */ -void hdlcdrv_arbitrate (struct net_device *dev,struct hdlcdrv_state *s) {if (!s || s->magic !=HDLCDRV_MAGIC || s->hdlctx.ptt || !s->skb)
@@ -396,7 +387,7 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)if ((--s->hdlctx.slotcnt) >0 )return ; s->hdlctx.slotcnt = s->ch_params.slottime; -if ((random_num () %256 ) > s->ch_params.ppersist) +if ((random32 () %256 ) > s->ch_params.ppersist)return ;start_tx (dev, s); }
drivers/net/hamradio/yam.c +2 -9
@@ -50,6 +50,7 @@#include <linux/slab.h> #include <linux/errno.h> #include <linux/bitops.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/system.h> #include <linux/interrupt.h>
@@ -566,14 +567,6 @@ static void yam_start_tx(struct net_device *dev, struct yam_port *yp)ptt_on (dev); } -static unsigned short random_seed; - -static inline unsigned short random_num (void ) -{ - random_seed =28629 * random_seed +157 ; -return random_seed; -} -static void yam_arbitrate (struct net_device *dev) {struct yam_port *yp =netdev_priv (dev);
@@ -600,7 +593,7 @@ static void yam_arbitrate(struct net_device *dev) yp->slotcnt = yp->slot /10 ;/* is random > persist ? */ -if ((random_num () %256 ) > yp->pers) +if ((random32 () %256 ) > yp->pers)return ;yam_start_tx (dev, yp);
drivers/net/natsemi.c +38 -5
123 lines not on this page · raw message
drivers/net/r8169.c +18 -7
@@ -1733,6 +1733,8 @@ rtl8169_remove_one(struct pci_dev *pdev)assert (dev !=NULL );assert (tp !=NULL ); +flush_scheduled_work (); +unregister_netdev (dev);rtl8169_release_board (pdev, dev, tp->mmio_addr);pci_set_drvdata (pdev,NULL );
@@ -2161,10 +2163,13 @@ static void rtl8169_reinit_task(struct work_struct *work)struct net_device *dev = tp->dev;int ret; -if (netif_running (dev)) { -rtl8169_wait_for_quiescence (dev); -rtl8169_close (dev); - } +rtnl_lock (); + +if (!netif_running (dev)) + goto out_unlock; + +rtl8169_wait_for_quiescence (dev); +rtl8169_close (dev); ret =rtl8169_open (dev);if (unlikely (ret <0 )) {
@@ -2179,6 +2184,9 @@ static void rtl8169_reinit_task(struct work_struct *work) }rtl8169_schedule_work (dev, rtl8169_reinit_task); } + +out_unlock: +rtnl_unlock (); }static void rtl8169_reset_task (struct work_struct *work)
@@ -2187,8 +2195,10 @@ static void rtl8169_reset_task(struct work_struct *work) container_of(work, struct rtl8169_private, task.work);struct net_device *dev = tp->dev; +rtnl_lock (); +if (!netif_running (dev)) -return ; + goto out_unlock;rtl8169_wait_for_quiescence (dev);
@@ -2210,6 +2220,9 @@ static void rtl8169_reset_task(struct work_struct *work) }rtl8169_schedule_work (dev, rtl8169_reset_task); } + +out_unlock: +rtnl_unlock (); }static void rtl8169_tx_timeout (struct net_device *dev)
@@ -2722,8 +2735,6 @@ static void rtl8169_down(struct net_device *dev)netif_stop_queue (dev); -flush_scheduled_work (); - core_down:spin_lock_irq (&tp->lock);
drivers/net/s2io.c +18 -3
@@ -3758,7 +3758,6 @@ static int s2io_close(struct net_device *dev) {struct s2io_nic *sp = dev->priv; -flush_scheduled_work ();netif_stop_queue (dev);/* Reset card, kill tasklet and free Tx and Rx buffers. */ s2io_card_down (sp);
@@ -5847,9 +5846,14 @@ static void s2io_set_link(struct work_struct *work) registeru64 val64;u16 subid; +rtnl_lock (); + +if (!netif_running (dev)) + goto out_unlock; +if (test_and_set_bit (0 , &(nic->link_state))) {/* The card is being reset, no point doing anything */ -return ; + goto out_unlock; } subid = nic->pdev->subsystem_device;
@@ -5903,6 +5907,9 @@ static void s2io_set_link(struct work_struct *work)s2io_link (nic,LINK_DOWN ); }clear_bit (0 , &(nic->link_state)); + +out_unlock: +rtnl_lock (); } static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
@@ -6356,6 +6363,11 @@ static void s2io_restart_nic(struct work_struct *work) struct s2io_nic *sp = container_of(work, struct s2io_nic, rst_timer_task);struct net_device *dev = sp->dev; +rtnl_lock (); + +if (!netif_running (dev)) + goto out_unlock; +s2io_card_down (sp);if (s2io_card_up (sp)) { DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
@@ -6364,7 +6376,8 @@ static void s2io_restart_nic(struct work_struct *work)netif_wake_queue (dev);DBG_PRINT (ERR_DBG ,"%s: was reset by Tx watchdog timer\n" , dev->name); - +out_unlock: +rtnl_unlock (); }/**
@@ -7173,6 +7186,8 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)return ; } +flush_scheduled_work (); + sp = dev->priv;unregister_netdev (dev);
drivers/net/sis190.c +5 -2
@@ -909,6 +909,9 @@ static void sis190_phy_task(struct work_struct *work)rtnl_lock (); +if (!netif_running (dev)) + goto out_unlock; + val =mdio_read (ioaddr, phy_id,MII_BMCR );if (val &BMCR_RESET ) {// FIXME: needlessly high ? -- FR 02/07/2005
@@ -981,6 +984,7 @@ static void sis190_phy_task(struct work_struct *work)netif_carrier_on (dev); } +out_unlock:rtnl_unlock (); }
@@ -1102,8 +1106,6 @@ static void sis190_down(struct net_device *dev)netif_stop_queue (dev); -flush_scheduled_work (); - do { spin_lock_irq(&tp->lock);
@@ -1857,6 +1859,7 @@ static void __devexit sis190_remove_one(struct pci_dev *pdev)struct net_device *dev =pci_get_drvdata (pdev);sis190_mii_remove (dev); +flush_scheduled_work ();unregister_netdev (dev);sis190_release_board (pdev);pci_set_drvdata (pdev,NULL );
drivers/net/skge.c +5 -4
@@ -1419,7 +1419,8 @@ static void xm_link_timer(struct work_struct *work)mutex_unlock (&hw->phy_mutex); nochange: -schedule_delayed_work (&skge->link_thread,LINK_HZ ); +if (netif_running (dev)) +schedule_delayed_work (&skge->link_thread,LINK_HZ ); }static void genesis_mac_init (struct skge_hw *hw,int port)
@@ -2530,7 +2531,7 @@ static int skge_down(struct net_device *dev)netif_stop_queue (dev);if (hw->chip_id ==CHIP_ID_GENESIS && hw->phy_type ==SK_PHY_XMAC ) -cancel_rearming_delayed_work (&skge->link_thread); +cancel_delayed_work (&skge->link_thread);skge_write8 (skge->hw,SK_REG (skge->port,LNK_LED_REG ),LED_OFF );if (hw->chip_id ==CHIP_ID_GENESIS )
@@ -3690,6 +3691,8 @@ static void __devexit skge_remove(struct pci_dev *pdev)if (!hw)return ; +flush_scheduled_work (); +if ((dev1 = hw->dev[1 ]))unregister_netdev (dev1); dev0 = hw->dev[0 ];
@@ -3704,8 +3707,6 @@ static void __devexit skge_remove(struct pci_dev *pdev)skge_write16 (hw,B0_LED ,LED_STAT_OFF );skge_write8 (hw,B0_CTST ,CS_RST_SET ); -flush_scheduled_work (); -free_irq (pdev->irq, hw);pci_release_regions (pdev);pci_disable_device (pdev);
drivers/net/wireless/airo.c +2 -2
@@ -1623,7 +1623,7 @@ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen,crypto_cipher_setkey (tfm, pkey,16 ); counter =0 ; -for (i =0 ; i < (sizeof (context->coeff)/sizeof (context->coeff[0 ])); ) { +for (i =0 ; i <ARRAY_SIZE (context->coeff); ) { aes_counter[15 ] = (u8)(counter >>0 ); aes_counter[14 ] = (u8)(counter >>8 ); aes_counter[13 ] = (u8)(counter >>16 );
@@ -1632,7 +1632,7 @@ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen,memcpy (plain, aes_counter,16 );crypto_cipher_encrypt_one (tfm, plain, plain); cipher = plain; -for (j=0 ; (j<16 ) && (i< (sizeof (context->coeff)/sizeof (context->coeff[0 ]))); ) { +for (j =0 ; (j <16 ) && (i <ARRAY_SIZE (context->coeff)); ) { context->coeff[i++] =ntohl (*(u32 *)&cipher[j]); j +=4 ; }
drivers/net/wireless/bcm43xx/bcm43xx.h +3 -5
@@ -21,7 +21,7 @@#define PFX KBUILD_MODNAME ": "#define BCM43xx_SWITCH_CORE_MAX_RETRIES 50 -#define BCM43xx_IRQWAIT_MAX_RETRIES 50 +#define BCM43xx_IRQWAIT_MAX_RETRIES 100#define BCM43xx_IO_SIZE 8192
@@ -333,7 +333,7 @@#define BCM43xx_SBF_PS2 0x04000000#define BCM43xx_SBF_NO_SSID_BCAST 0x08000000#define BCM43xx_SBF_TIME_UPDATE 0x10000000 -#define BCM43xx_SBF_80000000 0x80000000/*FIXME: fix name*/ +#define BCM43xx_SBF_MODE_G 0x80000000/* Microcode */ #define BCM43xx_UCODE_REVISION 0x0000
@@ -507,8 +507,6 @@ struct bcm43xx_sprominfo {u8 et1macaddr[6 ]; u8 et0phyaddr:5; u8 et1phyaddr:5; - u8 et0mdcport:1; - u8 et1mdcport:1;u8 boardrev; u8 locale:4; u8 antennas_aphy:2;
@@ -542,7 +540,7 @@ struct bcm43xx_lopair {struct bcm43xx_phyinfo {/* Hardware Data */ -u8 version; +u8 analog;u8 type;u8 rev;u16 antenna_diversity;
drivers/net/wireless/bcm43xx/bcm43xx_ilt.c +15 -0
@@ -325,6 +325,21 @@ void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val) } } +void bcm43xx_ilt_write32 (struct bcm43xx_private *bcm,u16 offset,u32 val) +{ +if (bcm43xx_current_phy (bcm)->type == BCM43xx_PHYTYPE_A) { +bcm43xx_phy_write (bcm, BCM43xx_PHY_ILT_A_CTRL, offset); +mmiowb (); +bcm43xx_phy_write (bcm, BCM43xx_PHY_ILT_A_DATA2, (val &0xFFFF0000 ) >>16 ); +bcm43xx_phy_write (bcm, BCM43xx_PHY_ILT_A_DATA1, val &0x0000FFFF ); + }else { +bcm43xx_phy_write (bcm, BCM43xx_PHY_ILT_G_CTRL, offset); +mmiowb (); +bcm43xx_phy_write (bcm, BCM43xx_PHY_ILT_G_DATA2, (val &0xFFFF0000 ) >>16 ); +bcm43xx_phy_write (bcm, BCM43xx_PHY_ILT_G_DATA1, val &0x0000FFFF ); + } +} +u16 bcm43xx_ilt_read (struct bcm43xx_private *bcm,u16 offset) {if (bcm43xx_current_phy (bcm)->type == BCM43xx_PHYTYPE_A) {
drivers/net/wireless/bcm43xx/bcm43xx_ilt.h +1 -0
@@ -27,6 +27,7 @@ extern const u16 bcm43xx_ilt_sigmasqr2[BCM43xx_ILT_SIGMASQR_SIZE];void bcm43xx_ilt_write (struct bcm43xx_private *bcm,u16 offset,u16 val); +void bcm43xx_ilt_write32 (struct bcm43xx_private *bcm,u16 offset,u32 val);u16 bcm43xx_ilt_read (struct bcm43xx_private *bcm,u16 offset);#endif /* BCM43xx_ILT_H_ */
drivers/net/wireless/bcm43xx/bcm43xx_main.c +8 -12
@@ -851,8 +851,6 @@ static int bcm43xx_sprom_extract(struct bcm43xx_private *bcm) value = sprom[BCM43xx_SPROM_ETHPHY]; bcm->sprom.et0phyaddr = (value &0x001F ); bcm->sprom.et1phyaddr = (value &0x03E0 ) >>5 ; - bcm->sprom.et0mdcport = (value & (1 <<14 )) >>14 ; - bcm->sprom.et1mdcport = (value & (1 <<15 )) >>15 ;/* boardrev, antennas, locale */ value = sprom[BCM43xx_SPROM_BOARDREV];
@@ -1449,12 +1447,10 @@ static void handle_irq_transmit_status(struct bcm43xx_private *bcm)bcm43xx_debugfs_log_txstat (bcm, &stat); -if (stat.flags & BCM43xx_TXSTAT_FLAG_IGNORE) +if (stat.flags & BCM43xx_TXSTAT_FLAG_AMPDU) +continue ; +if (stat.flags & BCM43xx_TXSTAT_FLAG_INTER)continue ; -if (!(stat.flags & BCM43xx_TXSTAT_FLAG_ACK)) { -//TODO: packet was not acked (was lost) - } -//TODO: There are more (unknown) flags to test. see bcm43xx_main.h if (bcm43xx_using_pio (bcm))bcm43xx_pio_handle_xmitstatus (bcm, &stat);
@@ -3696,7 +3692,7 @@ static int bcm43xx_read_phyinfo(struct bcm43xx_private *bcm) {struct bcm43xx_phyinfo *phy =bcm43xx_current_phy (bcm);u16 value; -u8 phy_version; +u8 phy_analog;u8 phy_type;u8 phy_rev;int phy_rev_ok =1 ;
@@ -3704,12 +3700,12 @@ static int bcm43xx_read_phyinfo(struct bcm43xx_private *bcm) value =bcm43xx_read16 (bcm, BCM43xx_MMIO_PHY_VER); - phy_version = (value &0xF000 ) >>12 ; + phy_analog = (value &0xF000 ) >>12 ; phy_type = (value &0x0F00 ) >>8 ; phy_rev = (value &0x000F ); - dprintk(KERN_INFO PFX "Detected PHY: Version: %x, Type %x, Revision %x\n", - phy_version, phy_type, phy_rev); + dprintk(KERN_INFO PFX "Detected PHY: Analog: %x, Type %x, Revision %x\n", + phy_analog, phy_type, phy_rev);switch (phy_type) {case BCM43xx_PHYTYPE_A:
@@ -3752,7 +3748,7 @@ static int bcm43xx_read_phyinfo(struct bcm43xx_private *bcm) phy_rev); } - phy->version = phy_version; + phy->analog = phy_analog; phy->type = phy_type; phy->rev = phy_rev;if ((phy_type == BCM43xx_PHYTYPE_B) || (phy_type == BCM43xx_PHYTYPE_G)) {
drivers/net/wireless/bcm43xx/bcm43xx_phy.c +85 -110
356 lines not on this page · raw message
drivers/net/wireless/bcm43xx/bcm43xx_radio.c +7 -6
@@ -1393,11 +1393,12 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm) backup[12 ] =bcm43xx_read16 (bcm, BCM43xx_MMIO_CHANNEL_EXT);// Initialization -if (phy->version ==0 ) { +if (phy->analog ==0 ) {bcm43xx_write16 (bcm,0x03E6 ,0x0122 ); }else { -if (phy->version >=2 ) -bcm43xx_write16 (bcm,0x03E6 ,0x0040 ); +if (phy->analog >=2 ) +bcm43xx_phy_write (bcm,0x0003 , (bcm43xx_phy_read (bcm,0x0003 ) + &0xFFBF ) |0x0040 );bcm43xx_write16 (bcm, BCM43xx_MMIO_CHANNEL_EXT, (bcm43xx_read16 (bcm, BCM43xx_MMIO_CHANNEL_EXT) |0x2000 )); }
@@ -1405,7 +1406,7 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm) ret =bcm43xx_radio_calibrationvalue (bcm);if (phy->type == BCM43xx_PHYTYPE_B) -bcm43xx_radio_write16 (bcm,0x0078 ,0x0003 ); +bcm43xx_radio_write16 (bcm,0x0078 ,0x0026 );bcm43xx_phy_write (bcm,0x0015 ,0xBFAF );bcm43xx_phy_write (bcm,0x002B ,0x1403 );
@@ -1416,7 +1417,7 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm) (bcm43xx_radio_read16(bcm, 0x0051) | 0x0004));bcm43xx_radio_write16 (bcm,0x0052 ,0x0000 );bcm43xx_radio_write16 (bcm,0x0043 , -bcm43xx_radio_read16 (bcm,0x0043 ) |0x0009 ); + (bcm43xx_radio_read16 (bcm,0x0043 ) &0xFFF0 ) |0x0009 );bcm43xx_phy_write (bcm,0x0058 ,0x0000 );for (i =0 ; i <16 ; i++) {
@@ -1488,7 +1489,7 @@ u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)bcm43xx_phy_write (bcm,0x0059 , backup[17 ]);bcm43xx_phy_write (bcm,0x0058 , backup[18 ]);bcm43xx_write16 (bcm,0x03E6 , backup[11 ]); -if (phy->version !=0 ) +if (phy->analog !=0 )bcm43xx_write16 (bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[12 ]);bcm43xx_phy_write (bcm,0x0035 , backup[10 ]);bcm43xx_radio_selectchannel (bcm, radio->channel,1 );
drivers/net/wireless/bcm43xx/bcm43xx_xmit.h +2 -8
@@ -137,14 +137,8 @@ struct bcm43xx_xmitstatus {u16 unknown;//FIXME }; -#define BCM43xx_TXSTAT_FLAG_ACK 0x01 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x02 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x04 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x08 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x10 -#define BCM43xx_TXSTAT_FLAG_IGNORE 0x20 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x40 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x80 +#define BCM43xx_TXSTAT_FLAG_AMPDU 0x10 +#define BCM43xx_TXSTAT_FLAG_INTER 0x20u8 bcm43xx_plcp_get_ratecode_cck (const u8 bitrate);u8 bcm43xx_plcp_get_ratecode_ofdm (const u8 bitrate);
drivers/net/wireless/hostap/hostap.h +2 -1
@@ -2,13 +2,14 @@#define HOSTAP_H #include <linux/ethtool.h> +#include <linux/kernel.h> #include "hostap_wlan.h" #include "hostap_ap.h" static const long freq_list[] = {2412 ,2417 ,2422 ,2427 ,2432 ,2437 ,2442 ,2447 ,2452 ,2457 ,2462 ,2467 ,2472 ,2484 }; -#define FREQ_COUNT (sizeof(freq_list) / sizeof(freq_list[0])) +#define FREQ_COUNT ARRAY_SIZE(freq_list)/* hostap.c */
drivers/net/wireless/ipw2100.c +6 -8
@@ -2888,7 +2888,7 @@ static int __ipw2100_tx_process(struct ipw2100_priv *priv)#ifdef CONFIG_IPW2100_DEBUG if (packet->info.c_struct.cmd->host_command_reg < -sizeof (command_types) /sizeof (*command_types)) +ARRAY_SIZE (command_types)) IPW_DEBUG_TX("Command '%s (%d)' processed: %d.\n", command_types[packet->info.c_struct.cmd-> host_command_reg],
@@ -3736,7 +3736,7 @@ static ssize_t show_registers(struct device *d, struct device_attribute *attr, out +=sprintf (out,"%30s [Address ] : Hex\n" ,"Register" ); -for (i =0 ; i < (sizeof (hw_data) /sizeof (*hw_data)); i++) { +for (i =0 ; i <ARRAY_SIZE (hw_data); i++) {read_register (dev, hw_data[i].addr, &val); out +=sprintf (out,"%30s [%08X] : %08X\n" , hw_data[i].name, hw_data[i].addr, val);
@@ -3757,7 +3757,7 @@ static ssize_t show_hardware(struct device *d, struct device_attribute *attr, out +=sprintf (out,"%30s [Address ] : Hex\n" ,"NIC entry" ); -for (i =0 ; i < (sizeof (nic_data) /sizeof (*nic_data)); i++) { +for (i =0 ; i <ARRAY_SIZE (nic_data); i++) {u8 tmp8;u16 tmp16;u32 tmp32;
@@ -3894,13 +3894,11 @@ static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,if (priv->status &STATUS_RF_KILL_MASK )return 0 ; -if (loop >=sizeof (ord_data) /sizeof (*ord_data)) +if (loop >=ARRAY_SIZE (ord_data)) loop =0 ;/* sysfs provides us PAGE_SIZE buffer */ -while (len <PAGE_SIZE -128 && - loop < (sizeof (ord_data) /sizeof (*ord_data))) { - +while (len <PAGE_SIZE -128 && loop <ARRAY_SIZE (ord_data)) { val_len =sizeof (u32); if (ipw2100_get_ordinal(priv, ord_data[loop].index, &val,
@@ -6589,7 +6587,7 @@ static const long ipw2100_rates_11b[] = {11000000 }; -#define RATE_COUNT (sizeof(ipw2100_rates_11b) / sizeof(ipw2100_rates_11b[0])) +#define RATE_COUNT ARRAY_SIZE(ipw2100_rates_11b) static int ipw2100_wx_get_name(struct net_device *dev, struct iw_request_info *info,
drivers/net/wireless/prism54/isl_ioctl.c +7 -1
@@ -1395,11 +1395,16 @@ static int prism54_set_auth(struct net_device *ndev,break ;case IW_AUTH_RX_UNENCRYPTED_EAPOL : - dot1x = param->value ?1 :0 ; +/* dot1x should be the opposite of RX_UNENCRYPTED_EAPOL; +* turn off dot1x when allowing receipt of unencrypted EAPOL +* frames, turn on dot1x when receipt should be disallowed +*/ + dot1x = param->value ?0 :0x01 ;break ;case IW_AUTH_PRIVACY_INVOKED : privinvoked = param->value ?1 :0 ; +break ;case IW_AUTH_DROP_UNENCRYPTED : exunencrypt = param->value ?1 :0 ;
@@ -1589,6 +1594,7 @@ static int prism54_set_encodeext(struct net_device *ndev, } key.type =DOT11_PRIV_TKIP ; key.length =KEY_SIZE_TKIP ; +break ;default :return -EINVAL ; }
drivers/net/wireless/prism54/oid_mgt.c +3 -1
@@ -16,6 +16,8 @@* */ +#include <linux/kernel.h> +#include "prismcompat.h" #include "islpci_dev.h" #include "islpci_mgt.h"
@@ -692,7 +694,7 @@ mgt_update_addr(islpci_private *priv)return ret; } -#define VEC_SIZE (a) (sizeof(a)/sizeof(a[0])) +#define VEC_SIZE (a) ARRAY_SIZE(a)int mgt_commit (islpci_private *priv)
drivers/net/wireless/wavelan.c +7 -7
@@ -28,7 +28,7 @@*/ static u8 wv_irq_to_psa (int irq) { -if (irq <0 || irq >=NELS (irqvals)) +if (irq <0 || irq >=ARRAY_SIZE (irqvals))return 0 ;return irqvals[irq];
@@ -42,7 +42,7 @@ static int __init wv_psa_to_irq(u8 irqval) {int irq; -for (irq =0 ; irq <NELS (irqvals); irq++) +for (irq =0 ; irq <ARRAY_SIZE (irqvals); irq++)if (irqvals[irq] == irqval)return irq;
@@ -1695,7 +1695,7 @@ static int wv_frequency_list(unsigned long ioaddr, /* I/O port of the card *//* Look in the table if the frequency is allowed */ if (table[9 - (freq /16 )] & (1 << (freq %16 ))) {/* Compute approximate channel number */ -while ((c <NELS (channel_bands)) && +while ((c <ARRAY_SIZE (channel_bands)) && (((channel_bands[c] >>1 ) -24 ) < freq)) c++; list[i].i = c;/* Set the list index */
@@ -4269,7 +4269,7 @@ struct net_device * __init wavelan_probe(int unit)printk (KERN_DEBUG "%s: <-wavelan_probe()\n" , dev->name);#endif }else {/* Scan all possible addresses of the WaveLAN hardware. */ -for (i =0 ; i <NELS (iobase); i++) { +for (i =0 ; i <ARRAY_SIZE (iobase); i++) { dev->irq = def_irq;if (wavelan_config (dev, iobase[i]) ==0 ) {#ifdef DEBUG_CALLBACK_TRACE
@@ -4280,7 +4280,7 @@ struct net_device * __init wavelan_probe(int unit)break ; } } -if (i ==NELS (iobase)) +if (i ==ARRAY_SIZE (iobase)) r = -ENODEV ; }if (r)
@@ -4327,14 +4327,14 @@ int __init init_module(void)#endif /* Copy the basic set of address to be probed. */ -for (i =0 ; i <NELS (iobase); i++) +for (i =0 ; i <ARRAY_SIZE (iobase); i++) io[i] = iobase[i]; }/* Loop on all possible base addresses. */ i =-1 ; -while ((io[++i] !=0 ) && (i <NELS (io))) { +while ((io[++i] !=0 ) && (i <ARRAY_SIZE (io))) {struct net_device *dev =alloc_etherdev (sizeof (net_local));if (!dev)break ;
drivers/net/wireless/wavelan.p.h +0 -3
@@ -449,9 +449,6 @@ static const char *version = "wavelan.c : v24 (SMP + wireless extensions) 11/12//* Watchdog temporisation */ #define WATCHDOG_JIFFIES (512*HZ/100) -/* Macro to get the number of elements in an array */ -#define NELS (a) (sizeof(a) / sizeof(a[0])) -/* ------------------------ PRIVATE IOCTL ------------------------ */ #define SIOCSIPQTHR SIOCIWFIRSTPRIV/* Set quality threshold */
drivers/net/wireless/zd1211rw/zd_chip.c +1 -1
@@ -113,7 +113,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr/* Allocate a single memory block for values and addresses. */ count16 =2 *count; - a16 =kmalloc (count16 * (sizeof (zd_addr_t) +sizeof (u16)), + a16 = (zd_addr_t *)kmalloc (count16 * (sizeof (zd_addr_t) +sizeof (u16)),GFP_NOFS );if (!a16) { dev_dbg_f(zd_chip_dev(chip),
include/linux/wireless.h +2 -2
@@ -334,7 +334,7 @@* separate range because of collisions with other tools such as * 'mii-tool'. * We now have 32 commands, so a bit more space ;-). -* Also, all 'odd' commands are only usable by root and don't return the +* Also, all 'even' commands are only usable by root and don't return the * content of ifr/iwr to user (but you are not obliged to use the set/get * convention, just use every other two command). More details in iwpriv.c. * And I repeat : you are not forced to use them with iwpriv, but you
@@ -348,7 +348,7 @@#define SIOCIWLAST SIOCIWLASTPRIV/* 0x8BFF */ #define IW_IOCTL_IDX (cmd) ((cmd) - SIOCIWFIRST) -/* Even : get (world access), odd : set (root access) */ +/* Odd : get (world access), even : set (root access) */ #define IW_IS_SET (cmd) (!((cmd) & 0x1))#define IW_IS_GET (cmd) ((cmd) & 0x1)
net/ieee80211/softmac/ieee80211softmac_module.c +3 -10
@@ -265,17 +265,10 @@ void ieee80211softmac_init_bss(struct ieee80211softmac_device *mac)/* Change the default txrate to the highest possible value. * The txrate machine will lower it, if it is too high. */ -/* FIXME: We don't correctly handle backing down to lower -rates, so 801.11g devices start off at 11M for now. People -can manually change it if they really need to, but 11M is -more reliable. Note similar logic in -ieee80211softmac_wx_set_rate() */ -if (ieee->modulation &IEEE80211_CCK_MODULATION ) { +if (ieee->modulation &IEEE80211_OFDM_MODULATION ) + txrates->user_rate =IEEE80211_OFDM_RATE_24MB ; +else txrates->user_rate =IEEE80211_CCK_RATE_11MB ; - }else if (ieee->modulation &IEEE80211_OFDM_MODULATION ) { - txrates->user_rate =IEEE80211_OFDM_RATE_54MB ; - }else -assert (0 ); txrates->default_rate =IEEE80211_CCK_RATE_1MB ; change |=IEEE80211SOFTMAC_TXRATECHG_DEFAULT ;
net/ieee80211/softmac/ieee80211softmac_wx.c +3 -8
@@ -177,15 +177,10 @@ ieee80211softmac_wx_set_rate(struct net_device *net_dev,int err = -EINVAL ;if (in_rate ==-1 ) { -/* FIXME: We don't correctly handle backing down to lower -rates, so 801.11g devices start off at 11M for now. People -can manually change it if they really need to, but 11M is -more reliable. Note similar logic in -ieee80211softmac_wx_set_rate() */ -if (ieee->modulation &IEEE80211_CCK_MODULATION ) - in_rate =11000000 ; +if (ieee->modulation &IEEE80211_OFDM_MODULATION ) + in_rate =24000000 ;else - in_rate =54000000 ; + in_rate =11000000 ; }switch (in_rate) {