diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-15 00:00:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-15 00:00:48 +0200 |
| commit | c597f6653d5734c11b1e3217c7619a37e96e5a1f (patch) | |
| tree | 2c24b46bbe265f3284dcec0a001f7af498794964 /net/mac80211/ibss.c | |
| parent | net: codel: fix build errors (diff) | |
| parent | iwlwifi: fix-up some merge damage from commit 0d6c4a2 (diff) | |
| download | linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.xz linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index d307d3b3e32a..ebafba61c2ff 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -164,7 +164,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap, sband->ht_cap.cap); pos = ieee80211_ie_build_ht_oper(pos, &sband->ht_cap, - chan, channel_type); + chan, channel_type, 0); } if (local->hw.queues >= IEEE80211_NUM_ACS) { |