diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-22 14:39:53 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-22 14:39:53 -0400 |
| commit | 133189a46c2c522eb4ef26b1ede63dd0a9fdc920 (patch) | |
| tree | 04ab3567c3bea31503c4dfa94909f99dc4b3789f /net/mac80211/iface.c | |
| parent | f761b6947dde42890beea59b020e1be87491809e (diff) | |
| parent | 0f6b3f597daab2254614e2773e322e73fb1b6f4b (diff) | |
| download | blackbird-op-linux-133189a46c2c522eb4ef26b1ede63dd0a9fdc920.tar.gz blackbird-op-linux-133189a46c2c522eb4ef26b1ede63dd0a9fdc920.zip | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 87aeb4f21ffd..728d3eac1f59 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -808,7 +808,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev, hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len)); - return ieee80211_select_queue_80211(local, skb, hdr); + return ieee80211_select_queue_80211(sdata, skb, hdr); } static const struct net_device_ops ieee80211_monitorif_ops = { |
