| 1 |
diff -Naur linux-2.6.21.1_orig/net/ieee80211/softmac/ieee80211softmac_module.c linux-2.6.21.1_rawtx/net/ieee80211/softmac/ieee80211softmac_module.c |
| 2 |
--- linux-2.6.21.1_orig/net/ieee80211/softmac/ieee80211softmac_module.c 2007-04-27 23:49:26.000000000 +0200 |
| 3 |
+++ linux-2.6.21.1_rawtx/net/ieee80211/softmac/ieee80211softmac_module.c 2007-12-03 23:38:51.000000000 +0100 |
| 4 |
@@ -238,18 +238,34 @@ |
| 5 |
struct ieee80211softmac_txrates *txrates = &mac->txrates; |
| 6 |
u32 change = 0; |
| 7 |
|
| 8 |
- change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; |
| 9 |
- txrates->default_rate = ieee80211softmac_highest_supported_rate(mac, &mac->bssinfo.supported_rates, 0); |
| 10 |
+ if (mac->ieee->iw_mode == IW_MODE_MONITOR) |
| 11 |
+ { |
| 12 |
+ change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; |
| 13 |
+ txrates->default_rate = mac->txrates.user_rate; |
| 14 |
|
| 15 |
- change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK; |
| 16 |
- txrates->default_fallback = lower_rate(mac, txrates->default_rate); |
| 17 |
+ change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK; |
| 18 |
+ txrates->default_fallback = mac->txrates.user_rate; |
| 19 |
|
| 20 |
- change |= IEEE80211SOFTMAC_TXRATECHG_MCAST; |
| 21 |
- txrates->mcast_rate = ieee80211softmac_highest_supported_rate(mac, &mac->bssinfo.supported_rates, 1); |
| 22 |
+ change |= IEEE80211SOFTMAC_TXRATECHG_MCAST; |
| 23 |
+ txrates->mcast_rate = mac->txrates.user_rate; |
| 24 |
|
| 25 |
- if (mac->txrates_change) |
| 26 |
- mac->txrates_change(mac->dev, change); |
| 27 |
+ if (mac->txrates_change) |
| 28 |
+ mac->txrates_change(mac->dev, change); |
| 29 |
+ } |
| 30 |
+ else |
| 31 |
+ { |
| 32 |
+ change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; |
| 33 |
+ txrates->default_rate = ieee80211softmac_highest_supported_rate(mac, &mac->bssinfo.supported_rates, 0); |
| 34 |
+ |
| 35 |
+ change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK; |
| 36 |
+ txrates->default_fallback = lower_rate(mac, txrates->default_rate); |
| 37 |
|
| 38 |
+ change |= IEEE80211SOFTMAC_TXRATECHG_MCAST; |
| 39 |
+ txrates->mcast_rate = ieee80211softmac_highest_supported_rate(mac, &mac->bssinfo.supported_rates, 1); |
| 40 |
+ |
| 41 |
+ if (mac->txrates_change) |
| 42 |
+ mac->txrates_change(mac->dev, change); |
| 43 |
+ } |
| 44 |
} |
| 45 |
|
| 46 |
void ieee80211softmac_init_bss(struct ieee80211softmac_device *mac) |