summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-01-06 15:35:49 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-06 15:35:49 -0500
commitdebde9ea24d5512400456b1b64df361e422f078d (patch)
treea1e9247c52a06cf2beaa1286e98b64563770169b /net/mac80211
parent7a4a77b7771164d61ce702a588067d1e1d66db7c (diff)
downloadop-kernel-dev-debde9ea24d5512400456b1b64df361e422f078d.zip
op-kernel-dev-debde9ea24d5512400456b1b64df361e422f078d.tar.gz
mac80211: fix-up build breakage in 2.6.33
"mac80211: fix skb buffering issue" is based on what will become 2.6.34, so it includes an incompatible usage of sta_info_get. This patch will need to be effectively reverted when merging for 2.6.34. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/wme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 34e6d02..79d887d 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -96,7 +96,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
}
if (!sta && ra && !is_multicast_ether_addr(ra)) {
- sta = sta_info_get(sdata, ra);
+ sta = sta_info_get(local, ra);
if (sta)
sta_flags = get_sta_flags(sta);
}
OpenPOWER on IntegriCloud