diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /net/mac80211/cfg.c | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 2ba3af850dda..140503d4c97a 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
| @@ -1863,6 +1863,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, | |||
| 1863 | 1863 | ||
| 1864 | wk->type = IEEE80211_WORK_OFFCHANNEL_TX; | 1864 | wk->type = IEEE80211_WORK_OFFCHANNEL_TX; |
| 1865 | wk->chan = chan; | 1865 | wk->chan = chan; |
| 1866 | wk->chan_type = channel_type; | ||
| 1866 | wk->sdata = sdata; | 1867 | wk->sdata = sdata; |
| 1867 | wk->done = ieee80211_offchan_tx_done; | 1868 | wk->done = ieee80211_offchan_tx_done; |
| 1868 | wk->offchan_tx.frame = skb; | 1869 | wk->offchan_tx.frame = skb; |