diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-21 17:47:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-21 17:47:33 -0500 |
| commit | 4b0d1a0b1fd7248d0fc341d00ed908c7373c7788 (patch) | |
| tree | 7ba1dad63482c9a3d4461ec324aef9f909e73f49 /net/mac80211/cfg.c | |
| parent | 8de65c2aaa1faf8e57e1b29b4265b6a57fae4136 (diff) | |
| parent | a9802d43f205faa2fff422502a1336a50b9615c3 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index d15ba0d0de9..c3de921c8cf 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2028,7 +2028,7 @@ ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb) if (wk->offchan_tx.wait && !wk->offchan_tx.status) cfg80211_mgmt_tx_status(wk->sdata->dev, (unsigned long) wk->offchan_tx.frame, - wk->ie, wk->ie_len, false, GFP_KERNEL); + wk->data, wk->data_len, false, GFP_KERNEL); return WORK_DONE_DESTROY; } @@ -2179,8 +2179,8 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, wk->done = ieee80211_offchan_tx_done; wk->offchan_tx.frame = skb; wk->offchan_tx.wait = wait; - wk->ie_len = len; - memcpy(wk->ie, buf, len); + wk->data_len = len; + memcpy(wk->data, buf, len); ieee80211_add_work(wk); return 0; |