diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-11-18 18:42:05 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-11-18 17:09:27 -0500 |
| commit | 62ae67be31c2346b6d74653a148ddbd1b9a94424 (patch) | |
| tree | 91f59c821a4e3f91a529887d97989b1969720f65 /net/mac80211/util.c | |
| parent | 875405a7793e9c35fab33819e7e5df7a98b6064c (diff) | |
| download | kernel_samsung_smdk4412-62ae67be31c2346b6d74653a148ddbd1b9a94424.zip kernel_samsung_smdk4412-62ae67be31c2346b6d74653a148ddbd1b9a94424.tar.gz kernel_samsung_smdk4412-62ae67be31c2346b6d74653a148ddbd1b9a94424.tar.bz2 | |
mac80211: remove encrypt parameter from ieee80211_tx_skb
Since the flags moved into skb->cb, there's no
longer a need to have the encrypt bool passed
into the function, anyone who requires it set
to 0 (false) can just set the flag directly.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index da86e15..5ae1bf3 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -872,7 +872,8 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, WARN_ON(err); } - ieee80211_tx_skb(sdata, skb, 0); + IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT; + ieee80211_tx_skb(sdata, skb); } int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, @@ -974,7 +975,8 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, skb_put(skb, ieee80211_build_preq_ies(local, pos, ie, ie_len, local->hw.conf.channel->band)); - ieee80211_tx_skb(sdata, skb, 0); + IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT; + ieee80211_tx_skb(sdata, skb); } u32 ieee80211_sta_get_rates(struct ieee80211_local *local, |