diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2010-05-19 12:17:12 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-02 16:13:27 -0400 |
| commit | 252aa631f88080920a7083ac5a5844ffc5463629 (patch) | |
| tree | e1482e9cf7c7230acb9ed33c8a24687e48dc7aa1 /net/wireless/mlme.c | |
| parent | 4f424867dd4752d457458fec29ca57ce5d7dc4ac (diff) | |
| download | kernel_samsung_aries-252aa631f88080920a7083ac5a5844ffc5463629.zip kernel_samsung_aries-252aa631f88080920a7083ac5a5844ffc5463629.tar.gz kernel_samsung_aries-252aa631f88080920a7083ac5a5844ffc5463629.tar.bz2 | |
cfg80211: make action channel type optional
When sending action frames, we want to verify
that we do that on the correct channel. However,
checking the channel type in addition can get in
the way, since the channel type could change on
the fly during an association, and it's not
useful to have the channel type anyway since it
has no effect on the transmission. Therefore,
make it optional to specify so that if wanted,
it can still be checked, but is not required.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 48ead6f..f69ae19 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -827,6 +827,7 @@ int cfg80211_mlme_action(struct cfg80211_registered_device *rdev, struct net_device *dev, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type, + bool channel_type_valid, const u8 *buf, size_t len, u64 *cookie) { struct wireless_dev *wdev = dev->ieee80211_ptr; @@ -855,7 +856,7 @@ int cfg80211_mlme_action(struct cfg80211_registered_device *rdev, /* Transmit the Action frame as requested by user space */ return rdev->ops->action(&rdev->wiphy, dev, chan, channel_type, - buf, len, cookie); + channel_type_valid, buf, len, cookie); } bool cfg80211_rx_action(struct net_device *dev, int freq, const u8 *buf, |