Please pull 'upstream-fixes' branch of wireless-2.6
Subsystems (3)
The following changes since commit 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e:
Linus Torvalds:
Linux 2.6.18-rc1
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-fixes
Daniel Drake:
zd1211rw: usb_clear_halt not allowed in IRQ context
Larry Finger:
bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 +- drivers/net/wireless/zd1211rw/zd_usb.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-)
drivers/net/wireless/bcm43xx/bcm43xx_main.c +1 -1
@@ -1547,7 +1547,7 @@ static void handle_irq_noise(struct bcm4 goto generate_new;/* Get the noise samples. */ -assert (bcm->noisecalc.nr_samples <=8 ); +assert (bcm->noisecalc.nr_samples <8 ); i = bcm->noisecalc.nr_samples; noise[0 ] =limit_value (noise[0 ],0 ,ARRAY_SIZE (radio->nrssi_lt) -1 ); noise[1 ] =limit_value (noise[1 ],0 ,ARRAY_SIZE (radio->nrssi_lt) -1 );
drivers/net/wireless/zd1211rw/zd_usb.c +3 -9
@@ -375,10 +375,8 @@ static void int_urb_complete(struct urbcase -ENODEV :case -ENOENT :case -ECONNRESET : - goto kfree;case -EPIPE : -usb_clear_halt (urb->dev,EP_INT_IN ); -/* FALL-THROUGH */ + goto kfree;default : goto resubmit; }
@@ -580,10 +578,8 @@ static void rx_urb_complete(struct urb *case -ENODEV :case -ENOENT :case -ECONNRESET : -return ;case -EPIPE : -usb_clear_halt (urb->dev,EP_DATA_IN ); -/* FALL-THROUGH */ +return ;default :dev_dbg_f (urb_dev (urb),"urb %p error %d\n" , urb, urb->status); goto resubmit;
@@ -749,11 +745,9 @@ static void tx_urb_complete(struct urb *case -ENODEV :case -ENOENT :case -ECONNRESET : +case -EPIPE :dev_dbg_f (urb_dev (urb),"urb %p error %d\n" , urb, urb->status);break ; -case -EPIPE : -usb_clear_halt (urb->dev,EP_DATA_OUT ); -/* FALL-THROUGH */ default :dev_dbg_f (urb_dev (urb),"urb %p error %d\n" , urb, urb->status); goto resubmit;
Signature · 2 lines
John W. Linville [email protected]
Please pull 'upstream' branch of wireless-2.6
These patches are to be queued for 2.6.19...
---
The following changes since commit b312d799b324e895745ffe148def234fc60d5b74:
Daniel Drake:
zd1211rw: usb_clear_halt not allowed in IRQ context
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream
Daniel Drake:
zd1211rw: Add Sagem device ID's
Larry Finger:
bcm43xx: improved statistics
Michael Buesch:
bcm43xx: opencoded locking
bcm43xx: voluntary preemtion in the calibration loops
drivers/net/wireless/bcm43xx/bcm43xx.h | 64 ++------- drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 34 +++-- drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 10 + drivers/net/wireless/bcm43xx/bcm43xx_main.c | 64 +++++---- drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 33 +++-- drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 4 - drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 34 +++-- drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 162 ++++++++++++++---------- drivers/net/wireless/zd1211rw/zd_usb.c | 2 9 files changed, 215 insertions(+), 192 deletions(-)
drivers/net/wireless/bcm43xx/bcm43xx.h +14 -50
@@ -649,6 +649,19 @@ enum {#define bcm43xx_status (bcm) atomic_read(&(bcm)->init_status)#define bcm43xx_set_status (bcm, stat) atomic_set(&(bcm)->init_status, (stat)) +/* *** THEORY OF LOCKING *** +* +* We have two different locks in the bcm43xx driver. +* => bcm->mutex: General sleeping mutex. Protects struct bcm43xx_private +* and the device registers. This mutex does _not_ protect +* against concurrency from the IRQ handler. +* => bcm->irq_lock: IRQ spinlock. Protects against IRQ handler concurrency. +* +* Please note that, if you only take the irq_lock, you are not protected +* against concurrency from the periodic work handlers. +* Most times you want to take _both_ locks. +*/ +struct bcm43xx_private {struct ieee80211_device *ieee;struct ieee80211softmac_device *softmac;
@@ -659,7 +672,6 @@ struct bcm43xx_private {void __iomem *mmio_addr; -/* Locking, see "theory of locking" text below. */ spinlock_t irq_lock;struct mutex mutex;
@@ -691,6 +703,7 @@ struct bcm43xx_private {struct bcm43xx_sprominfo sprom;#define BCM43xx_NR_LEDS 4struct bcm43xx_led leds[BCM43xx_NR_LEDS]; +spinlock_t leds_lock;/* The currently active core. */ struct bcm43xx_coreinfo *current_core;
@@ -763,55 +776,6 @@ #endif }; -/* *** THEORY OF LOCKING *** -* -* We have two different locks in the bcm43xx driver. -* => bcm->mutex: General sleeping mutex. Protects struct bcm43xx_private -* and the device registers. -* => bcm->irq_lock: IRQ spinlock. Protects against IRQ handler concurrency. -* -* We have three types of helper function pairs to utilize these locks. -* (Always use the helper functions.) -* 1) bcm43xx_{un}lock_noirq(): -* Takes bcm->mutex. Does _not_ protect against IRQ concurrency, -* so it is almost always unsafe, if device IRQs are enabled. -* So only use this, if device IRQs are masked. -* Locking may sleep. -* You can sleep within the critical section. -* 2) bcm43xx_{un}lock_irqonly(): -* Takes bcm->irq_lock. Does _not_ protect against -* bcm43xx_lock_noirq() critical sections. -* Does only protect against the IRQ handler path and other -* irqonly() critical sections. -* Locking does not sleep. -* You must not sleep within the critical section. -* 3) bcm43xx_{un}lock_irqsafe(): -* This is the cummulative lock and takes both, mutex and irq_lock. -* Protects against noirq() and irqonly() critical sections (and -* the IRQ handler path). -* Locking may sleep. -* You must not sleep within the critical section. -*/ - -/* Lock type 1 */ -#define bcm43xx_lock_noirq (bcm) mutex_lock(&(bcm)->mutex) -#define bcm43xx_unlock_noirq (bcm) mutex_unlock(&(bcm)->mutex) -/* Lock type 2 */ -#define bcm43xx_lock_irqonly (bcm, flags) \ - spin_lock_irqsave(&(bcm)->irq_lock, flags) -#define bcm43xx_unlock_irqonly (bcm, flags) \ - spin_unlock_irqrestore(&(bcm)->irq_lock, flags) -/* Lock type 3 */ -#define bcm43xx_lock_irqsafe (bcm, flags) do { \ - bcm43xx_lock_noirq(bcm); \ - bcm43xx_lock_irqonly(bcm, flags); \ - } while (0) -#define bcm43xx_unlock_irqsafe (bcm, flags) do { \ - bcm43xx_unlock_irqonly(bcm, flags); \ - bcm43xx_unlock_noirq(bcm); \ - } while (0) - -static inline struct bcm43xx_private *bcm43xx_priv (struct net_device *dev) {
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c +22 -12
@@ -77,7 +77,8 @@ static ssize_t devinfo_read_file(structdown (&big_buffer_sem); -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags);if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) {fappend ("Board not initialized.\n" ); goto out;
@@ -121,7 +122,8 @@ #undef fappend_corefappend ("\n" ); out: -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos);up (&big_buffer_sem);return res;
@@ -159,7 +161,8 @@ static ssize_t spromdump_read_file(strucunsigned long flags;down (&big_buffer_sem); -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags);if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) {fappend ("Board not initialized.\n" ); goto out;
@@ -169,7 +172,8 @@ static ssize_t spromdump_read_file(strucfappend ("boardflags: 0x%04x\n" , bcm->sprom.boardflags); out: -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos);up (&big_buffer_sem);return res;
@@ -188,7 +192,8 @@ static ssize_t tsf_read_file(struct fileu64 tsf;down (&big_buffer_sem); -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags);if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) {fappend ("Board not initialized.\n" ); goto out;
@@ -199,7 +204,8 @@ static ssize_t tsf_read_file(struct file (unsigned int)(tsf & 0xFFFFFFFFULL)); out: -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos);up (&big_buffer_sem);return res;
@@ -221,7 +227,8 @@ static ssize_t tsf_write_file(struct fil res = -EFAULT ; goto out_up; } -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags);if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) { printk(KERN_INFO PFX "debugfs: Board not initialized.\n"); res = -EFAULT ;
@@ -237,7 +244,8 @@ static ssize_t tsf_write_file(struct fil res = buf_size; out_unlock: -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex); out_up:up (&big_buffer_sem);return res;
@@ -258,7 +266,8 @@ static ssize_t txstat_read_file(struct fint i, cnt, j =0 ;down (&big_buffer_sem); -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags);fappend ("Last %d logged xmitstatus blobs (Latest first):\n\n" , BCM43xx_NR_LOGGED_XMITSTATUS);
@@ -294,14 +303,15 @@ static ssize_t txstat_read_file(struct f i = BCM43xx_NR_LOGGED_XMITSTATUS -1 ; } -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos); -bcm43xx_lock_irqsafe (bcm, flags); +spin_lock_irqsave (&bcm->irq_lock, flags);if (*ppos == pos) {/* Done. Drop the copied data. */ e->xmitstatus_printing =0 ; } -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex);up (&big_buffer_sem);return res; }
drivers/net/wireless/bcm43xx/bcm43xx_leds.c +8 -2
@@ -51,12 +51,12 @@ static void bcm43xx_led_blink(unsigned lstruct bcm43xx_private *bcm = led->bcm;unsigned long flags; -bcm43xx_lock_irqonly (bcm, flags); +spin_lock_irqsave (&bcm->leds_lock, flags);if (led->blink_interval) {bcm43xx_led_changestate (led);mod_timer (&led->blink_timer, jiffies + led->blink_interval); } -bcm43xx_unlock_irqonly (bcm, flags); +spin_unlock_irqrestore (&bcm->leds_lock, flags); } static void bcm43xx_led_blink_start(struct bcm43xx_led *led,
@@ -177,7 +177,9 @@ void bcm43xx_leds_update(struct bcm43xx_int i, turn_on;unsigned long interval =0 ;u16 ledctl; +unsigned long flags; +spin_lock_irqsave (&bcm->leds_lock, flags); ledctl =bcm43xx_read16 (bcm, BCM43xx_MMIO_GPIO_CONTROL);for (i =0 ; i < BCM43xx_NR_LEDS; i++) { led = &(bcm->leds[i]);
@@ -266,6 +268,7 @@ #endif /* CONFIG_BCM43XX_DEBUG */ ledctl &= ~(1 << i); }bcm43xx_write16 (bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl); +spin_unlock_irqrestore (&bcm->leds_lock, flags); }void bcm43xx_leds_switch_all (struct bcm43xx_private *bcm,int on)
@@ -274,7 +277,9 @@ void bcm43xx_leds_switch_all(struct bcm4u16 ledctl;int i;int bit_on; +unsigned long flags; +spin_lock_irqsave (&bcm->leds_lock, flags); ledctl =bcm43xx_read16 (bcm, BCM43xx_MMIO_GPIO_CONTROL);for (i =0 ; i < BCM43xx_NR_LEDS; i++) { led = &(bcm->leds[i]);
@@ -290,4 +295,5 @@ void bcm43xx_leds_switch_all(struct bcm4 ledctl &= ~(1 << i); }bcm43xx_write16 (bcm, BCM43xx_MMIO_GPIO_CONTROL, ledctl); +spin_unlock_irqrestore (&bcm->leds_lock, flags); }
drivers/net/wireless/bcm43xx/bcm43xx_main.c +32 -32
201 lines not on this page · raw message
drivers/net/wireless/bcm43xx/bcm43xx_phy.c +18 -15
@@ -81,6 +81,16 @@ static const s8 bcm43xx_tssi2dbm_g_tablestatic void bcm43xx_phy_initg (struct bcm43xx_private *bcm); +static inline +void bcm43xx_voluntary_preempt (void ) +{ +assert (!in_atomic () && !in_irq () && + !in_interrupt () && !irqs_disabled ()); +#ifndef CONFIG_PREEMPT +cond_resched (); +#endif /* CONFIG_PREEMPT */ +} +void bcm43xx_raw_phy_lock (struct bcm43xx_private *bcm) {struct bcm43xx_phyinfo *phy =bcm43xx_current_phy (bcm);
@@ -133,22 +143,14 @@ void bcm43xx_phy_write(struct bcm43xx_prvoid bcm43xx_phy_calibrate (struct bcm43xx_private *bcm) {struct bcm43xx_phyinfo *phy =bcm43xx_current_phy (bcm); -unsigned long flags;bcm43xx_read32 (bcm, BCM43xx_MMIO_STATUS_BITFIELD);/* Dummy read. */ if (phy->calibrated)return ;if (phy->type == BCM43xx_PHYTYPE_G && phy->rev ==1 ) { -/* We do not want to be preempted while calibrating -* the hardware. -*/ -local_irq_save (flags); -bcm43xx_wireless_core_reset (bcm,0 );bcm43xx_phy_initg (bcm);bcm43xx_wireless_core_reset (bcm,1 ); - -local_irq_restore (flags); } phy->calibrated =1 ; }
@@ -1299,7 +1301,9 @@ static u16 bcm43xx_phy_lo_b_r15_loop(str {int i;u16 ret =0 ; +unsigned long flags; +local_irq_save (flags);for (i =0 ; i <10 ; i++){bcm43xx_phy_write (bcm,0x0015 ,0xAFA0 );udelay (1 );
@@ -1309,6 +1313,8 @@ static u16 bcm43xx_phy_lo_b_r15_loop(strudelay (40 ); ret +=bcm43xx_phy_read (bcm,0x002C ); } +local_irq_restore (flags); +bcm43xx_voluntary_preempt ();return ret; }
@@ -1435,6 +1441,7 @@ u16 bcm43xx_phy_lo_g_deviation_subval(st } ret =bcm43xx_phy_read (bcm,0x002D );local_irq_restore (flags); +bcm43xx_voluntary_preempt ();return ret; }
@@ -1760,6 +1767,7 @@ void bcm43xx_phy_lo_g_measure(struct bcmbcm43xx_radio_write16 (bcm,0x43 , i);bcm43xx_radio_write16 (bcm,0x52 , radio->txctl2);udelay (10 ); +bcm43xx_voluntary_preempt ();bcm43xx_phy_set_baseband_attenuation (bcm, j *2 );
@@ -1803,6 +1811,7 @@ void bcm43xx_phy_lo_g_measure(struct bcm radio->txctl2 | (3/*txctl1*/ << 4));//FIXME: shouldn't txctl1 be zero here and 3 in the loop above?udelay (10 ); +bcm43xx_voluntary_preempt ();bcm43xx_phy_set_baseband_attenuation (bcm, j *2 );
@@ -1824,6 +1833,7 @@ void bcm43xx_phy_lo_g_measure(struct bcmbcm43xx_phy_write (bcm,0x0812 , (r27 <<8 ) |0xA2 );udelay (2 );bcm43xx_phy_write (bcm,0x0812 , (r27 <<8 ) |0xA3 ); +bcm43xx_voluntary_preempt (); }else bcm43xx_phy_write (bcm,0x0015 , r27 |0xEFA0 );bcm43xx_phy_lo_adjust (bcm, is_initializing);
@@ -2188,12 +2198,6 @@ int bcm43xx_phy_init(struct bcm43xx_priv {struct bcm43xx_phyinfo *phy =bcm43xx_current_phy (bcm);int err = -ENODEV ; -unsigned long flags; - -/* We do not want to be preempted while calibrating -* the hardware. -*/ -local_irq_save (flags);switch (phy->type) {case BCM43xx_PHYTYPE_A:
@@ -2227,7 +2231,6 @@ int bcm43xx_phy_init(struct bcm43xx_priv err =0 ;break ; } -local_irq_restore (flags);if (err) printk(KERN_WARNING PFX "Unknown PHYTYPE found!\n");
drivers/net/wireless/bcm43xx/bcm43xx_pio.c +2 -2
@@ -262,7 +262,7 @@ static void tx_tasklet(unsigned long d)int err;u16 txctl; -bcm43xx_lock_irqonly (bcm, flags); +spin_lock_irqsave (&bcm->irq_lock, flags);if (queue->tx_frozen) goto out_unlock;
@@ -300,7 +300,7 @@ static void tx_tasklet(unsigned long d)continue ; } out_unlock: -bcm43xx_unlock_irqonly (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); }static void setup_txqueues (struct bcm43xx_pioqueue *queue)
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c +22 -12
@@ -120,12 +120,14 @@ static ssize_t bcm43xx_attr_sprom_show(s GFP_KERNEL);if (!sprom)return -ENOMEM ; -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags); err =bcm43xx_sprom_read (bcm, sprom);if (!err) err =sprom2hex (sprom, buf,PAGE_SIZE );mmiowb (); -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex);kfree (sprom);return err;
@@ -150,10 +152,14 @@ static ssize_t bcm43xx_attr_sprom_store( err =hex2sprom (sprom, buf, count);if (err) goto out_kfree; -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags); +spin_lock (&bcm->leds_lock); err =bcm43xx_sprom_write (bcm, sprom);mmiowb (); -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock (&bcm->leds_lock); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex); out_kfree:kfree (sprom);
@@ -176,7 +182,7 @@ static ssize_t bcm43xx_attr_interfmode_sif (!capable (CAP_NET_ADMIN ))return -EPERM ; -bcm43xx_lock_noirq (bcm); +mutex_lock (&bcm->mutex);switch (bcm43xx_current_radio (bcm)->interfmode) {case BCM43xx_RADIO_INTERFMODE_NONE:
@@ -193,7 +199,7 @@ static ssize_t bcm43xx_attr_interfmode_s } err =0 ; -bcm43xx_unlock_noirq (bcm); +mutex_unlock (&bcm->mutex);return err ? err : count;
@@ -229,7 +235,8 @@ static ssize_t bcm43xx_attr_interfmode_sreturn -EINVAL ; } -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags); err =bcm43xx_radio_set_interference_mitigation (bcm, mode);if (err) {
@@ -237,7 +244,8 @@ static ssize_t bcm43xx_attr_interfmode_s "supported by device\n"); }mmiowb (); -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex);return err ? err : count; }
@@ -257,7 +265,7 @@ static ssize_t bcm43xx_attr_preamble_shoif (!capable (CAP_NET_ADMIN ))return -EPERM ; -bcm43xx_lock_noirq (bcm); +mutex_lock (&bcm->mutex);if (bcm->short_preamble) count =snprintf (buf,PAGE_SIZE ,"1 (Short Preamble enabled)\n" );
@@ -265,7 +273,7 @@ static ssize_t bcm43xx_attr_preamble_sho count =snprintf (buf,PAGE_SIZE ,"0 (Short Preamble disabled)\n" ); err =0 ; -bcm43xx_unlock_noirq (bcm); +mutex_unlock (&bcm->mutex);return err ? err : count; }
@@ -285,12 +293,14 @@ static ssize_t bcm43xx_attr_preamble_sto value =get_boolean (buf, count);if (value <0 )return value; -bcm43xx_lock_irqsafe (bcm, flags); +mutex_lock (&bcm->mutex); +spin_lock_irqsave (&bcm->irq_lock, flags); bcm->short_preamble = !!value; err =0 ; -bcm43xx_unlock_irqsafe (bcm, flags); +spin_unlock_irqrestore (&bcm->irq_lock, flags); +mutex_unlock (&bcm->mutex);return err ? err : count; }
drivers/net/wireless/bcm43xx/bcm43xx_wx.c +95 -67
433 lines not on this page · raw message
drivers/net/wireless/zd1211rw/zd_usb.c +2 -0
@@ -39,9 +39,11 @@ static struct usb_device_id usb_ids[] = { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 }, { USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 }, { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 }, + { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 }, /* ZD1211B */ { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B }, { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B }, {} };
Signature · 2 lines
John W. Linville [email protected]
Re: Please pull 'upstream' branch of wireless-2.6
Quoted 10 lines · you
These patches are to be queued for 2.6.19...
---
The following changes since commit
b312d799b324e895745ffe148def234fc60d5b74:
Daniel Drake:
zd1211rw:usb_clear_haltnot allowed in IRQ contextare found in the git repository at:
Quoted 7 lines
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitupstreamDaniel Drake:
zd1211rw: Add Sagem device ID'sLarry Finger:
bcm43xx: improved statistics
Larry, I see that several patches from you got merged now. Please make sure that you also submit patches for bcm43xx-d80211. If you don't, your changes will all be lost, as soon as bcm43xx-d80211 is merged upstream and softmac is dropped.
Signature · 1 line
Greetings Michael.
Re: Please pull 'upstream' branch of wireless-2.6
Quoted 6 lines · Michael Buesch
On Monday 10 July 2006 23:31, you wrote:
Larry, I see that several patches from you got merged now. Please make sure that you also submit patches for bcm43xx-d80211. If you don't, your changes will all be lost, as soon as bcm43xx-d80211 is merged upstream and softmac is dropped.
Will do. A couple of days ago I downloaded a copy of the wireless-dev repository, and now have the master code so that I can prepare the patches.
Will the upstream merge of d80211 be made for 2.6.19 or later?
Larry
Re: Please pull 'upstream' branch of wireless-2.6
In reply to John W. LinvilleQuoted 22 lines · John W. Linville
These patches are to be queued for 2.6.19...
---
The following changes since commit
b312d799b324e895745ffe148def234fc60d5b74:
Daniel Drake:
zd1211rw:usb_clear_haltnot allowed in IRQ contextare found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitupstreamDaniel Drake:
zd1211rw: Add Sagem device ID'sLarry Finger:
bcm43xx: improved statisticsMichael Buesch:
bcm43xx: opencoded locking
bcm43xx: voluntary preemtion in the calibration loops
Quoted 9 lines
drivers/net/wireless/bcm43xx/bcm43xx.h | 64 ++------- drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 34 +++-- drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 10 + drivers/net/wireless/bcm43xx/bcm43xx_main.c | 64 +++++---- drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 33 +++-- drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 4 - drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 34 +++-- drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 162 ++++++++++++++---------- drivers/net/wireless/zd1211rw/zd_usb.c | 2
pulled