diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-01 15:26:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-01 15:26:52 -0400 |
commit | 7546ff95499781306e8fd7d84ae38b84be961364 (patch) | |
tree | 58416d00380ad1122acee71b594b26ab9a201e48 /net/mac80211/mesh_plink.c | |
parent | 2cdf359a521bb72286b6714478dfdbcd2691f3fe (diff) | |
parent | c82b5a74cc739385db6e4275fe504a0e9469bf01 (diff) | |
download | lwn-7546ff95499781306e8fd7d84ae38b84be961364.tar.gz lwn-7546ff95499781306e8fd7d84ae38b84be961364.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/mesh_plink.c')
-rw-r--r-- | net/mac80211/mesh_plink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 02c05fa15c20..6b65d5055f5b 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -379,7 +379,7 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata, u32 rates, basic_rates = 0, changed = 0; sband = local->hw.wiphy->bands[band]; - rates = ieee80211_sta_get_rates(local, elems, band, &basic_rates); + rates = ieee80211_sta_get_rates(sdata, elems, band, &basic_rates); spin_lock_bh(&sta->lock); sta->last_rx = jiffies; |