aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/ibss.c4
-rw-r--r--net/mac80211/ieee80211_i.h2
-rw-r--r--net/mac80211/mlme.c4
-rw-r--r--net/mac80211/util.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 291c9e07f1bd..c6b1448224f2 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -279,7 +279,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
279 ibss_dbg(sdata, 279 ibss_dbg(sdata,
280 "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n", 280 "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
281 sdata->vif.addr, addr, sdata->u.ibss.bssid); 281 sdata->vif.addr, addr, sdata->u.ibss.bssid);
282 ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0, 282 ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, 0, NULL, 0,
283 addr, sdata->u.ibss.bssid, NULL, 0, 0); 283 addr, sdata->u.ibss.bssid, NULL, 0, 0);
284 } 284 }
285 return sta; 285 return sta;
@@ -397,7 +397,7 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
397 * However, try to reply to authentication attempts if someone 397 * However, try to reply to authentication attempts if someone
398 * has actually implemented this. 398 * has actually implemented this.
399 */ 399 */
400 ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, NULL, 0, 400 ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, 0, NULL, 0,
401 mgmt->sa, sdata->u.ibss.bssid, NULL, 0, 0); 401 mgmt->sa, sdata->u.ibss.bssid, NULL, 0, 0);
402} 402}
403 403
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 132577d22928..c06219fe9094 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1531,7 +1531,7 @@ static inline void ieee80211_add_pending_skbs(struct ieee80211_local *local,
1531} 1531}
1532 1532
1533void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, 1533void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
1534 u16 transaction, u16 auth_alg, 1534 u16 transaction, u16 auth_alg, u16 status,
1535 u8 *extra, size_t extra_len, const u8 *bssid, 1535 u8 *extra, size_t extra_len, const u8 *bssid,
1536 const u8 *da, const u8 *key, u8 key_len, u8 key_idx); 1536 const u8 *da, const u8 *key, u8 key_len, u8 key_idx);
1537void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, 1537void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f3f338541b01..a79bea5b93b7 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1864,7 +1864,7 @@ static void ieee80211_auth_challenge(struct ieee80211_sub_if_data *sdata,
1864 return; 1864 return;
1865 auth_data->expected_transaction = 4; 1865 auth_data->expected_transaction = 4;
1866 drv_mgd_prepare_tx(sdata->local, sdata); 1866 drv_mgd_prepare_tx(sdata->local, sdata);
1867 ieee80211_send_auth(sdata, 3, auth_data->algorithm, 1867 ieee80211_send_auth(sdata, 3, auth_data->algorithm, 0,
1868 elems.challenge - 2, elems.challenge_len + 2, 1868 elems.challenge - 2, elems.challenge_len + 2,
1869 auth_data->bss->bssid, auth_data->bss->bssid, 1869 auth_data->bss->bssid, auth_data->bss->bssid,
1870 auth_data->key, auth_data->key_len, 1870 auth_data->key, auth_data->key_len,
@@ -2762,7 +2762,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
2762 IEEE80211_AUTH_MAX_TRIES); 2762 IEEE80211_AUTH_MAX_TRIES);
2763 2763
2764 auth_data->expected_transaction = 2; 2764 auth_data->expected_transaction = 2;
2765 ieee80211_send_auth(sdata, 1, auth_data->algorithm, 2765 ieee80211_send_auth(sdata, 1, auth_data->algorithm, 0,
2766 auth_data->ie, auth_data->ie_len, 2766 auth_data->ie, auth_data->ie_len,
2767 auth_data->bss->bssid, 2767 auth_data->bss->bssid,
2768 auth_data->bss->bssid, NULL, 0, 0); 2768 auth_data->bss->bssid, NULL, 0, 0);
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index b732e219b107..558412d75ac3 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -978,7 +978,7 @@ u32 ieee80211_mandatory_rates(struct ieee80211_local *local,
978} 978}
979 979
980void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, 980void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
981 u16 transaction, u16 auth_alg, 981 u16 transaction, u16 auth_alg, u16 status,
982 u8 *extra, size_t extra_len, const u8 *da, 982 u8 *extra, size_t extra_len, const u8 *da,
983 const u8 *bssid, const u8 *key, u8 key_len, u8 key_idx) 983 const u8 *bssid, const u8 *key, u8 key_len, u8 key_idx)
984{ 984{
@@ -1003,7 +1003,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
1003 memcpy(mgmt->bssid, bssid, ETH_ALEN); 1003 memcpy(mgmt->bssid, bssid, ETH_ALEN);
1004 mgmt->u.auth.auth_alg = cpu_to_le16(auth_alg); 1004 mgmt->u.auth.auth_alg = cpu_to_le16(auth_alg);
1005 mgmt->u.auth.auth_transaction = cpu_to_le16(transaction); 1005 mgmt->u.auth.auth_transaction = cpu_to_le16(transaction);
1006 mgmt->u.auth.status_code = cpu_to_le16(0); 1006 mgmt->u.auth.status_code = cpu_to_le16(status);
1007 if (extra) 1007 if (extra)
1008 memcpy(skb_put(skb, extra_len), extra, extra_len); 1008 memcpy(skb_put(skb, extra_len), extra, extra_len);
1009 1009