diff options
| author | Javier Cardona <javier@cozybit.com> | 2011-05-03 16:57:19 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-11 14:50:36 -0400 |
| commit | fd5999cf11c8322568034bbf0d5594be94542a57 (patch) | |
| tree | 6412f1f32214531c7e6157099084bf2cca709612 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 1833d81a1229adeab98f275b47624d66462561e5 (diff) | |
| download | linux-3.10-fd5999cf11c8322568034bbf0d5594be94542a57.tar.gz linux-3.10-fd5999cf11c8322568034bbf0d5594be94542a57.tar.bz2 linux-3.10-fd5999cf11c8322568034bbf0d5594be94542a57.zip | |
ath9k: fix beaconing for mesh interfaces
Mesh beaconing on ath9k was broken by this commit:
commit 4801416c76a3a355076d6d371c00270dfe332e1c
Author: Ben Greear <greearb@candelatech.com>
Date: Sat Jan 15 19:13:48 2011 +0000
This patch assigns the right opmode when the device is used in mesh
mode.
Reported-by: Fabrice Deyber fabricedeyber@agilemesh.com
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index c4d32c54224..9dd72d8c78e 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1385,7 +1385,9 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw, ath9k_hw_set_tsfadjust(ah, 0); sc->sc_flags &= ~SC_OP_TSF_RESET; - if (iter_data.nwds + iter_data.nmeshes) + if (iter_data.nmeshes) + ah->opmode = NL80211_IFTYPE_MESH_POINT; + else if (iter_data.nwds) ah->opmode = NL80211_IFTYPE_AP; else if (iter_data.nadhocs) ah->opmode = NL80211_IFTYPE_ADHOC; |