diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-28 14:11:18 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-28 14:11:18 -0500 |
| commit | 39338b56382ac640614851a80e0bd71994cc664d (patch) | |
| tree | c319e23181be286b1d320c29f755a81e5ef61172 /net/mac80211/mesh_plink.c | |
| parent | 8b7ff200010600ef7cd9d002f9f8f97edfc7578e (diff) | |
| parent | eb1852b10593dc3ca73e02bf9ac4753a5a464905 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/mesh_plink.c')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 0140e88a8220..7314372b12ba 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -101,7 +101,8 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata, set_sta_flag(sta, WLAN_STA_WME); sta->sta.supp_rates[local->hw.conf.channel->band] = rates; if (elems->ht_cap_elem) - ieee80211_ht_cap_ie_to_sta_ht_cap(sband, elems->ht_cap_elem, + ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband, + elems->ht_cap_elem, &sta->sta.ht_cap); rate_control_rate_init(sta); |