diff options
Diffstat (limited to 'net/wireless/ibss.c')
| -rw-r--r-- | net/wireless/ibss.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 27a8ce9343c..8cb6e08373b 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c | |||
| @@ -88,6 +88,25 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, | |||
| 88 | if (wdev->ssid_len) | 88 | if (wdev->ssid_len) |
| 89 | return -EALREADY; | 89 | return -EALREADY; |
| 90 | 90 | ||
| 91 | if (!params->basic_rates) { | ||
| 92 | /* | ||
| 93 | * If no rates were explicitly configured, | ||
| 94 | * use the mandatory rate set for 11b or | ||
| 95 | * 11a for maximum compatibility. | ||
| 96 | */ | ||
| 97 | struct ieee80211_supported_band *sband = | ||
| 98 | rdev->wiphy.bands[params->channel->band]; | ||
| 99 | int j; | ||
| 100 | u32 flag = params->channel->band == IEEE80211_BAND_5GHZ ? | ||
| 101 | IEEE80211_RATE_MANDATORY_A : | ||
| 102 | IEEE80211_RATE_MANDATORY_B; | ||
| 103 | |||
| 104 | for (j = 0; j < sband->n_bitrates; j++) { | ||
| 105 | if (sband->bitrates[j].flags & flag) | ||
| 106 | params->basic_rates |= BIT(j); | ||
| 107 | } | ||
| 108 | } | ||
| 109 | |||
| 91 | if (WARN_ON(wdev->connect_keys)) | 110 | if (WARN_ON(wdev->connect_keys)) |
| 92 | kfree(wdev->connect_keys); | 111 | kfree(wdev->connect_keys); |
| 93 | wdev->connect_keys = connkeys; | 112 | wdev->connect_keys = connkeys; |