diff options
Diffstat (limited to 'package/mac80211/patches/310-ibss_ht.patch')
| -rw-r--r-- | package/mac80211/patches/310-ibss_ht.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/package/mac80211/patches/310-ibss_ht.patch b/package/mac80211/patches/310-ibss_ht.patch index eb1c8fce8b..1acd253f02 100644 --- a/package/mac80211/patches/310-ibss_ht.patch +++ b/package/mac80211/patches/310-ibss_ht.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -1085,6 +1085,7 @@ struct cfg80211_ibss_params { +@@ -1101,6 +1101,7 @@ struct cfg80211_ibss_params { u8 *ssid; u8 *bssid; struct ieee80211_channel *channel; @@ -8,7 +8,7 @@ u8 *ie; u8 ssid_len, ie_len; u16 beacon_interval; -@@ -2584,6 +2585,12 @@ struct cfg80211_bss *cfg80211_get_bss(st +@@ -2612,6 +2613,12 @@ struct cfg80211_bss *cfg80211_get_bss(st const u8 *bssid, const u8 *ssid, size_t ssid_len, u16 capa_mask, u16 capa_val); @@ -23,7 +23,7 @@ struct ieee80211_channel *channel, --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -4470,13 +4470,41 @@ static int nl80211_join_ibss(struct sk_b +@@ -4539,13 +4539,41 @@ static int nl80211_join_ibss(struct sk_b ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]); } @@ -89,7 +89,7 @@ struct wireless_dev *wdev, int freq, --- a/net/wireless/core.h +++ b/net/wireless/core.h -@@ -441,6 +441,9 @@ cfg80211_can_add_interface(struct cfg802 +@@ -439,6 +439,9 @@ cfg80211_can_add_interface(struct cfg802 struct ieee80211_channel * rdev_freq_to_chan(struct cfg80211_registered_device *rdev, int freq, enum nl80211_channel_type channel_type); @@ -161,7 +161,7 @@ struct ieee80211_channel *channel, --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -464,6 +464,7 @@ struct ieee80211_if_ibss { +@@ -465,6 +465,7 @@ struct ieee80211_if_ibss { u8 ssid_len, ie_len; u8 *ie; struct ieee80211_channel *channel; @@ -169,7 +169,7 @@ unsigned long ibss_join_req; /* probe response/beacon for IBSS */ -@@ -1089,6 +1090,7 @@ void ieee80211_ibss_notify_scan_complete +@@ -1091,6 +1092,7 @@ void ieee80211_ibss_notify_scan_complete void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata); struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, u8 *bssid, u8 *addr, u32 supp_rates, @@ -177,7 +177,7 @@ gfp_t gfp); int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, struct cfg80211_ibss_params *params); -@@ -1343,6 +1345,12 @@ void ieee80211_recalc_smps(struct ieee80 +@@ -1344,6 +1346,12 @@ void ieee80211_recalc_smps(struct ieee80 size_t ieee80211_ie_split(const u8 *ies, size_t ielen, const u8 *ids, int n_ids, size_t offset); size_t ieee80211_ie_split_vendor(const u8 *ies, size_t ielen, size_t offset); @@ -190,7 +190,7 @@ /* internal work items */ void ieee80211_work_init(struct ieee80211_local *local); -@@ -1371,6 +1379,8 @@ ieee80211_get_channel_mode(struct ieee80 +@@ -1372,6 +1380,8 @@ ieee80211_get_channel_mode(struct ieee80 bool ieee80211_set_channel_type(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, enum nl80211_channel_type chantype); @@ -201,7 +201,7 @@ #define debug_noinline noinline --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -841,23 +841,8 @@ int ieee80211_build_preq_ies(struct ieee +@@ -839,23 +839,8 @@ int ieee80211_build_preq_ies(struct ieee offset = noffset; } @@ -227,7 +227,7 @@ /* * If adding more here, adjust code in main.c -@@ -1381,3 +1366,100 @@ void ieee80211_disable_rssi_reports(stru +@@ -1378,3 +1363,100 @@ void ieee80211_disable_rssi_reports(stru _ieee80211_enable_rssi_reports(sdata, 0, 0); } EXPORT_SYMBOL(ieee80211_disable_rssi_reports); @@ -376,7 +376,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata, --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c -@@ -84,6 +84,8 @@ static void ieee80211_send_addba_request +@@ -82,6 +82,8 @@ static void ieee80211_send_addba_request memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN); else if (sdata->vif.type == NL80211_IFTYPE_STATION) memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN); @@ -385,7 +385,7 @@ mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); -@@ -400,7 +402,8 @@ int ieee80211_start_tx_ba_session(struct +@@ -399,7 +401,8 @@ int ieee80211_start_tx_ba_session(struct if (sdata->vif.type != NL80211_IFTYPE_STATION && sdata->vif.type != NL80211_IFTYPE_AP_VLAN && sdata->vif.type != NL80211_IFTYPE_AP && @@ -397,7 +397,7 @@ if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) { --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c -@@ -203,6 +203,8 @@ void ieee80211_send_delba(struct ieee802 +@@ -199,6 +199,8 @@ void ieee80211_send_delba(struct ieee802 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN); else if (sdata->vif.type == NL80211_IFTYPE_STATION) memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN); @@ -687,7 +687,7 @@ if (params->ie) { --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2161,7 +2161,8 @@ ieee80211_rx_h_action(struct ieee80211_r +@@ -2164,7 +2164,8 @@ ieee80211_rx_h_action(struct ieee80211_r if (sdata->vif.type != NL80211_IFTYPE_STATION && sdata->vif.type != NL80211_IFTYPE_AP_VLAN && sdata->vif.type != NL80211_IFTYPE_AP && @@ -697,7 +697,7 @@ break; /* verify action_code is present */ -@@ -2696,7 +2697,8 @@ static int prepare_for_handlers(struct i +@@ -2699,7 +2700,8 @@ static int prepare_for_handlers(struct i else rate_idx = status->rate_idx; rx->sta = ieee80211_ibss_add_sta(sdata, bssid, @@ -709,7 +709,7 @@ case NL80211_IFTYPE_MESH_POINT: --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c -@@ -186,6 +186,8 @@ static void ieee80211_send_addba_resp(st +@@ -182,6 +182,8 @@ static void ieee80211_send_addba_resp(st memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN); else if (sdata->vif.type == NL80211_IFTYPE_WDS) memcpy(mgmt->bssid, da, ETH_ALEN); |