Please pull 'fixes-davem' branch of wireless-2.6
Subsystems (4)
Dave,
Here are a few fixes for 2.6.24. I don't think there is anything controversial here.
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/fixes-davem/
---
The following changes since commit dbeeb816e805091e7cfc03baf36dc40b4adb2bbd:
Linus Torvalds (1):
Linux 2.6.24-rc2
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-davem
Helmut Schaa (1):
mac80211: Fix queuing of scan containing a SSID
Ivo van Doorn (1):
rt2x00: Fix chipset revision validation
Mohamed Abbas (1):
iwl3945: place CCK rates in front of OFDM for supported rates
Oliver Neukum (1):
iwl4965: fix not correctly dealing with hotunplug
drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 56 ++++++++++-- drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 29 +++++- drivers/net/wireless/iwlwifi/iwl-3945.c | 126 +++++++++++++++------------ drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 +- drivers/net/wireless/iwlwifi/iwl4965-base.c | 8 +- drivers/net/wireless/rt2x00/rt2500pci.c | 4 +- drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- drivers/net/wireless/rt2x00/rt2x00.h | 8 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 +- net/mac80211/ieee80211_i.h | 2 + net/mac80211/ieee80211_sta.c | 8 ++- 11 files changed, 167 insertions(+), 84 deletions(-)
drivers/net/wireless/iwlwifi/iwl-3945-rs.c +48 -8
@@ -71,19 +71,19 @@ struct iwl_rate_scale_priv { };static s32 iwl_expected_tpt_g[IWL_RATE_COUNT ] = { -0 ,0 ,76 ,104 ,130 ,168 ,191 ,202 ,7 ,13 ,35 ,58 +7 ,13 ,35 ,58 ,0 ,0 ,76 ,104 ,130 ,168 ,191 ,202 };static s32 iwl_expected_tpt_g_prot[IWL_RATE_COUNT ] = { -0 ,0 ,0 ,80 ,93 ,113 ,123 ,125 ,7 ,13 ,35 ,58 +7 ,13 ,35 ,58 ,0 ,0 ,0 ,80 ,93 ,113 ,123 ,125 };static s32 iwl_expected_tpt_a[IWL_RATE_COUNT ] = { -40 ,57 ,72 ,98 ,121 ,154 ,177 ,186 ,0 ,0 ,0 ,0 +0 ,0 ,0 ,0 ,40 ,57 ,72 ,98 ,121 ,154 ,177 ,186 };static s32 iwl_expected_tpt_b[IWL_RATE_COUNT ] = { -0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,7 ,13 ,35 ,58 +7 ,13 ,35 ,58 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 };struct iwl_tpt_entry {
@@ -350,6 +350,10 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, sta->last_txrate = sta->txrate; +/* For MODE_IEEE80211A mode it start at IWL_FIRST_OFDM_RATE */ +if (local->hw.conf.phymode ==MODE_IEEE80211A ) + sta->last_txrate +=IWL_FIRST_OFDM_RATE ; +IWL_DEBUG_RATE ("leave\n" ); }
@@ -417,6 +421,33 @@ static void rs_free_sta(void *priv, void *priv_sta)IWL_DEBUG_RATE ("leave\n" ); } + +/* +* get ieee prev rate from rate scale table. +* for A and B mode we need to overright prev +* value +*/ +static int rs_adjust_next_rate (struct iwl_priv *priv,int rate) +{ +int next_rate =iwl_get_prev_ieee_rate (rate); + +switch (priv->phymode) { +case MODE_IEEE80211A : +if (rate ==IWL_RATE_12M_INDEX ) + next_rate =IWL_RATE_9M_INDEX ; +else if (rate ==IWL_RATE_6M_INDEX ) + next_rate =IWL_RATE_6M_INDEX ; +break ; +case MODE_IEEE80211B : +if (rate ==IWL_RATE_11M_INDEX_TABLE ) + next_rate =IWL_RATE_5M_INDEX_TABLE ; +break ; +default : +break ; + } + +return next_rate; +}/** * rs_tx_status - Update rate control values based on Tx results *
@@ -479,7 +510,8 @@ static void rs_tx_status(void *priv_rate, last_index = scale_rate_index; }else { current_count = priv->retry_rate; - last_index =iwl_get_prev_ieee_rate (scale_rate_index); + last_index =rs_adjust_next_rate (priv, + scale_rate_index); }/* Update this rate accounting for as many retries
@@ -494,9 +526,10 @@ static void rs_tx_status(void *priv_rate,if (retries) scale_rate_index = -iwl_get_prev_ieee_rate (scale_rate_index); +rs_adjust_next_rate (priv, scale_rate_index); } +/* Update the last index window with success/failure based on ACK */ IWL_DEBUG_RATE("Update rate %d with %s.\n", last_index,
@@ -672,7 +705,10 @@ static struct ieee80211_rate *rs_get_rate(void *priv_rate, } rate_mask = sta->supp_rates; - index =min (sta->txrate &0xffff ,IWL_RATE_COUNT -1 ); + index =min (sta->last_txrate &0xffff ,IWL_RATE_COUNT -1 ); + +if (priv->phymode == (u8 )MODE_IEEE80211A ) + rate_mask = rate_mask <<IWL_FIRST_OFDM_RATE ; rs_priv = (void *)sta->rate_ctrl_priv;
@@ -801,7 +837,11 @@ static struct ieee80211_rate *rs_get_rate(void *priv_rate, out: sta->last_txrate = index; - sta->txrate = sta->last_txrate; +if (priv->phymode == (u8 )MODE_IEEE80211A ) + sta->txrate = sta->last_txrate -IWL_FIRST_OFDM_RATE ; +else + sta->txrate = sta->last_txrate; +sta_info_put (sta);IWL_DEBUG_RATE ("leave: %d\n" , index);
drivers/net/wireless/iwlwifi/iwl-3945-rs.h +24 -5
@@ -36,10 +36,17 @@ struct iwl_rate_info {u8 next_rs;/* next rate used in rs algo */ u8 prev_rs_tgg;/* previous rate used in TGG rs algo */ u8 next_rs_tgg;/* next rate used in TGG rs algo */ +u8 table_rs_index;/* index in rate scale table cmd */ +u8 prev_table_rs;/* prev in rate table cmd */ + };enum { -IWL_RATE_6M_INDEX =0 , +IWL_RATE_1M_INDEX =0 , +IWL_RATE_2M_INDEX , +IWL_RATE_5M_INDEX , +IWL_RATE_11M_INDEX , +IWL_RATE_6M_INDEX ,IWL_RATE_9M_INDEX ,IWL_RATE_12M_INDEX ,IWL_RATE_18M_INDEX ,
@@ -47,16 +54,28 @@ enum {IWL_RATE_36M_INDEX ,IWL_RATE_48M_INDEX ,IWL_RATE_54M_INDEX , -IWL_RATE_1M_INDEX , -IWL_RATE_2M_INDEX , -IWL_RATE_5M_INDEX , -IWL_RATE_11M_INDEX ,IWL_RATE_COUNT ,IWL_RATE_INVM_INDEX ,IWL_RATE_INVALID =IWL_RATE_INVM_INDEX };enum { +IWL_RATE_6M_INDEX_TABLE =0 , +IWL_RATE_9M_INDEX_TABLE , +IWL_RATE_12M_INDEX_TABLE , +IWL_RATE_18M_INDEX_TABLE , +IWL_RATE_24M_INDEX_TABLE , +IWL_RATE_36M_INDEX_TABLE , +IWL_RATE_48M_INDEX_TABLE , +IWL_RATE_54M_INDEX_TABLE , +IWL_RATE_1M_INDEX_TABLE , +IWL_RATE_2M_INDEX_TABLE , +IWL_RATE_5M_INDEX_TABLE , +IWL_RATE_11M_INDEX_TABLE , +IWL_RATE_INVM_INDEX_TABLE =IWL_RATE_INVM_INDEX , +}; + +enum {IWL_FIRST_OFDM_RATE =IWL_RATE_6M_INDEX ,IWL_LAST_OFDM_RATE =IWL_RATE_54M_INDEX , IWL_FIRST_CCK_RATE = IWL_RATE_1M_INDEX,
drivers/net/wireless/iwlwifi/iwl-3945.c +69 -57
278 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl3945-base.c +2 -2
@@ -5331,13 +5331,13 @@ static int iwl_init_geos(struct iwl_priv *priv)/* 5.2GHz channels start after the 2.4GHz channels */ modes[A ].mode =MODE_IEEE80211A ; modes[A ].channels = &channels[ARRAY_SIZE (iwl_eeprom_band_1)]; - modes[A ].rates = rates; + modes[A ].rates = &rates[4 ]; modes[A ].num_rates =8 ;/* just OFDM */ modes[A ].num_channels =0 ; modes[B ].mode =MODE_IEEE80211B ; modes[B ].channels = channels; - modes[B ].rates = &rates[8 ]; + modes[B ].rates = rates; modes[B ].num_rates =4 ;/* just CCK */ modes[B ].num_channels =0 ;
drivers/net/wireless/iwlwifi/iwl4965-base.c +5 -3
@@ -5156,9 +5156,10 @@ static irqreturn_t iwl_isr(int irq, void *data) }if ((inta ==0xFFFFFFFF ) || ((inta &0xFFFFFFF0 ) ==0xa5a5a5a0 )) { -/* Hardware disappeared */ +/* Hardware disappeared. It might have already raised +* an interrupt */ IWL_WARNING ("HARDWARE GONE?? INTA == 0x%080x\n" , inta); - goto none; + goto unplugged; } IWL_DEBUG_ISR("ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
@@ -5166,8 +5167,9 @@ static irqreturn_t iwl_isr(int irq, void *data)/* iwl_irq_tasklet() will service interrupts and re-enable them */ tasklet_schedule (&priv->irq_tasklet); -spin_unlock (&priv->lock); + unplugged: +spin_unlock (&priv->lock);return IRQ_HANDLED ; none:
drivers/net/wireless/rt2x00/rt2500pci.c +2 -2
@@ -620,7 +620,7 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)* up to version C the link tuning should halt after 20 * seconds. */ -if (rt2x00_get_rev (&rt2x00dev->chip) <RT2560_VERSION_D && +if (rt2x00_rev (&rt2x00dev->chip) <RT2560_VERSION_D && rt2x00dev->link.count >20 )return ;
@@ -630,7 +630,7 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)* Chipset versions C and lower should directly continue * to the dynamic CCA tuning. */ -if (rt2x00_get_rev (&rt2x00dev->chip) <RT2560_VERSION_D ) +if (rt2x00_rev (&rt2x00dev->chip) <RT2560_VERSION_D ) goto dynamic_cca_tune;/*
drivers/net/wireless/rt2x00/rt2500usb.c +2 -2
@@ -753,7 +753,7 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev)rt2x00_set_field16 (®,MAC_CSR1_HOST_READY ,1 );rt2500usb_register_write (rt2x00dev,MAC_CSR1 , reg); -if (rt2x00_get_rev (&rt2x00dev->chip) >=RT2570_VERSION_C ) { +if (rt2x00_rev (&rt2x00dev->chip) >=RT2570_VERSION_C ) {rt2500usb_register_read (rt2x00dev,PHY_CSR2 , ®); reg &= ~0x0002 ; }else {
@@ -1257,7 +1257,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)rt2500usb_register_read (rt2x00dev,MAC_CSR0 , ®);rt2x00_set_chip (rt2x00dev,RT2570 , value, reg); -if (rt2x00_rev (&rt2x00dev->chip,0xffff0 )) { +if (!rt2x00_check_rev (&rt2x00dev->chip,0 )) {ERROR (rt2x00dev,"Invalid RT chipset detected.\n" );return -ENODEV ; }
drivers/net/wireless/rt2x00/rt2x00.h +5 -3
@@ -751,14 +751,16 @@ static inline char rt2x00_rf(const struct rt2x00_chip *chipset, const u16 chip)return (chipset->rf == chip); } -static inline u16 rt2x00_get_rev (const struct rt2x00_chip *chipset) +static inline u16 rt2x00_rev (const struct rt2x00_chip *chipset) {return chipset->rev; } -static inline u16 rt2x00_rev (const struct rt2x00_chip *chipset,const u32 mask) +static inline u16 rt2x00_check_rev (const struct rt2x00_chip *chipset, +const u32 rev) { -return chipset->rev & mask; +return (((chipset->rev &0xffff0 ) == rev) && + !!(chipset->rev &0x0000f )); }/*
drivers/net/wireless/rt2x00/rt73usb.c +1 -1
@@ -1486,7 +1486,7 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)rt73usb_register_read (rt2x00dev,MAC_CSR0 , ®);rt2x00_set_chip (rt2x00dev,RT2571 , value, reg); -if (!rt2x00_rev (&rt2x00dev->chip,0x25730 )) { +if (!rt2x00_check_rev (&rt2x00dev->chip,0x25730 )) {ERROR (rt2x00dev,"Invalid RT chipset detected.\n" );return -ENODEV ; }
net/mac80211/ieee80211_i.h +2 -0
@@ -241,6 +241,8 @@ struct ieee80211_if_sta {u8 bssid[ETH_ALEN ], prev_bssid[ETH_ALEN ];u8 ssid[IEEE80211_MAX_SSID_LEN ];size_t ssid_len; +u8 scan_ssid[IEEE80211_MAX_SSID_LEN ]; +size_t scan_ssid_len;u16 aid;u16 ap_capab, capab;u8 *extra_ie;/* to be added to the end of AssocReq */
net/mac80211/ieee80211_sta.c +7 -1
@@ -1998,7 +1998,10 @@ void ieee80211_sta_work(struct work_struct *work)if (ifsta->state !=IEEE80211_AUTHENTICATE && ifsta->state !=IEEE80211_ASSOCIATE &&test_and_clear_bit (IEEE80211_STA_REQ_SCAN , &ifsta->request)) { -ieee80211_sta_start_scan (dev,NULL ,0 ); +if (ifsta->scan_ssid_len) +ieee80211_sta_start_scan (dev, ifsta->scan_ssid, ifsta->scan_ssid_len); +else +ieee80211_sta_start_scan (dev,NULL ,0 );return ; }
@@ -2868,6 +2871,9 @@ int ieee80211_sta_req_scan(struct net_device *dev, u8 *ssid, size_t ssid_len)return -EBUSY ; } + ifsta->scan_ssid_len = ssid_len; +if (ssid_len) +memcpy (ifsta->scan_ssid, ssid, ssid_len);set_bit (IEEE80211_STA_REQ_SCAN , &ifsta->request);queue_work (local->hw.workqueue, &ifsta->work);return 0 ;
Signature · 2 lines
John W. Linville [email protected]
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Wed, 14 Nov 2007 21:51:50 -0500
Quoted 2 lines
Here are a few fixes for 2.6.24. I don't think there is anything controversial here.
...
Quoted 7 lines
The following changes since commit
dbeeb816e805091e7cfc03baf36dc40b4adb2bbd:
Linus Torvalds (1):Linux 2.6.24-rc2are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitfixes-davem
I'll pull this in, thanks a lot John.
A message that is not in the archive (sent off-list or not yet received): 20071114.194053.165159394.davem-fT/PcQaiUtIeIZ0/[email protected]
Please pull 'more-fixes-davem' branch of wireless-2.6
Dave,
Here is one more fix for 2.6.24. This is additive to the pull request from yesterday (2007-11-15), so if you haven't already pulled then you can just pull this one to get all the fix patches.
Thanks!
John
---
Individual patch available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6.git more-fixes-davem
---
The following changes since commit 66fbb541a5d2d58fdae21c1e7b558a75bfbd483f:
Oliver Neukum (1):
iwl4965: fix not correctly dealing with hotunplug
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git more-fixes-davem
Ivo van Doorn (1):
rt2x00: Request usb_maxpacket() once
drivers/net/wireless/rt2x00/rt2500usb.c | 7 +++---- drivers/net/wireless/rt2x00/rt2x00.h | 7 ++++++- drivers/net/wireless/rt2x00/rt2x00usb.c | 9 ++++++--- drivers/net/wireless/rt2x00/rt73usb.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)
drivers/net/wireless/rt2x00/rt2500usb.c +3 -4
@@ -1032,7 +1032,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, }static int rt2500usb_get_tx_data_len (struct rt2x00_dev *rt2x00dev, -int maxpacket,struct sk_buff *skb) +struct sk_buff *skb) {int length;
@@ -1041,7 +1041,7 @@ static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,* but it must _not_ be a multiple of the USB packet size. */ length =roundup (skb->len,2 ); - length += (2 * !(length % maxpacket)); + length += (2 * !(length % rt2x00dev->usb_maxpacket));return length; }
@@ -1643,7 +1643,6 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,struct data_entry *beacon;struct data_entry *guardian;int pipe =usb_sndbulkpipe (usb_dev,1 ); -int max_packet =usb_maxpacket (usb_dev, pipe,1 );int length;/*
@@ -1672,7 +1671,7 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw, ring->desc_size), skb->len - ring->desc_size, control); - length =rt2500usb_get_tx_data_len (rt2x00dev, max_packet, skb); + length =rt2500usb_get_tx_data_len (rt2x00dev, skb);usb_fill_bulk_urb (beacon->priv, usb_dev, pipe, skb->data, length, rt2500usb_beacondone, beacon);
drivers/net/wireless/rt2x00/rt2x00.h +6 -1
@@ -418,7 +418,7 @@ struct rt2x00lib_ops {int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,struct data_ring *ring,struct sk_buff *skb,struct ieee80211_tx_control *control); -int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,int maxpacket, +int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,struct sk_buff *skb);void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,unsigned int queue);
@@ -599,6 +599,11 @@ struct rt2x00_dev {u32 *rf;/* +* USB Max frame size (for rt2500usb & rt73usb). +*/ +u16 usb_maxpacket; + +/* * Current TX power value. */ u16 tx_power;
drivers/net/wireless/rt2x00/rt2x00usb.c +6 -3
@@ -159,7 +159,6 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,interface_to_usbdev (rt2x00dev_usb (rt2x00dev));struct data_entry *entry =rt2x00_get_data_entry (ring);int pipe =usb_sndbulkpipe (usb_dev,1 ); -int max_packet =usb_maxpacket (usb_dev, pipe,1 );u32 length;if (rt2x00_ring_full (ring)) {
@@ -194,8 +193,7 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,* length of the data to usb_fill_bulk_urb. Pass the skb * to the driver to determine what the length should be. */ - length = rt2x00dev->ops->lib->get_tx_data_len (rt2x00dev, - max_packet, skb); + length = rt2x00dev->ops->lib->get_tx_data_len (rt2x00dev, skb);/* * Initialize URB and send the frame to the device.
@@ -490,6 +488,11 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, rt2x00dev->ops = ops; rt2x00dev->hw = hw; + rt2x00dev->usb_maxpacket = +usb_maxpacket (usb_dev,usb_sndbulkpipe (usb_dev,1 ),1 ); +if (!rt2x00dev->usb_maxpacket) + rt2x00dev->usb_maxpacket =1 ; + retval =rt2x00usb_alloc_reg (rt2x00dev);if (retval) goto exit_free_device;
drivers/net/wireless/rt2x00/rt73usb.c +2 -2
@@ -1251,7 +1251,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, }static int rt73usb_get_tx_data_len (struct rt2x00_dev *rt2x00dev, -int maxpacket,struct sk_buff *skb) +struct sk_buff *skb) {int length;
@@ -1260,7 +1260,7 @@ static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,* but it must _not_ be a multiple of the USB packet size. */ length =roundup (skb->len,4 ); - length += (4 * !(length % maxpacket)); + length += (4 * !(length % rt2x00dev->usb_maxpacket));return length; }
Signature · 2 lines
John W. Linville [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: Please pull 'more-fixes-davem' branch of wireless-2.6
From: "John W. Linville" <[email protected]>
Date: Thu, 15 Nov 2007 20:49:17 -0500
Quoted 5 lines
Dave,
Here is one more fix for 2.6.24. This is additive to the pull request from yesterday (2007-11-15), so if you haven't already pulled then you can just pull this one to get all the fix patches.
Pulled, thanks a lot John.