bf6f7cf29b
The removed patches were applied upstream. Remove the 300-mac80211-optimize-skb-resizing.patch. This patch was not applied upstream, but it conflicts with upstream changes and needs bigger changes. It was applied with Felix to remove this patch for now. It should be reworked and then send upstream later. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
20 lines
614 B
Diff
20 lines
614 B
Diff
--- a/net/wireless/reg.c
|
|
+++ b/net/wireless/reg.c
|
|
@@ -3047,6 +3047,8 @@ void regulatory_hint_country_ie(struct w
|
|
enum environment_cap env = ENVIRON_ANY;
|
|
struct regulatory_request *request = NULL, *lr;
|
|
|
|
+ return;
|
|
+
|
|
/* IE len must be evenly divisible by 2 */
|
|
if (country_ie_len & 0x01)
|
|
return;
|
|
@@ -3298,6 +3300,7 @@ static bool is_wiphy_all_set_reg_flag(en
|
|
|
|
void regulatory_hint_disconnect(void)
|
|
{
|
|
+ return;
|
|
/* Restore of regulatory settings is not required when wiphy(s)
|
|
* ignore IE from connected access point but clearance of beacon hints
|
|
* is required when wiphy(s) supports beacon hints.
|