diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-07 19:02:57 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-11 00:13:47 +0200 |
commit | d6b158b8698148b4123239f46579a719899b6ae4 (patch) | |
tree | edb0d305e989141c956eddb6d94594d1f66107df /package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch | |
parent | 148d59c67edd550cf130f96844f63637707b99d5 (diff) | |
download | upstream-d6b158b8698148b4123239f46579a719899b6ae4.tar.gz upstream-d6b158b8698148b4123239f46579a719899b6ae4.tar.bz2 upstream-d6b158b8698148b4123239f46579a719899b6ae4.zip |
mac80211: Update to 4.19.137-1
b43 and b43legacy now support ieee80211w, hardware crypto will be
deactivated in such cases.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch b/package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch index bcbec4cd6d..0e13e2fecc 100644 --- a/package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch +++ b/package/kernel/mac80211/patches/subsys/353-mac80211-mesh-drop-redundant-rcu_read_lock-unlock-ca.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c -@@ -1115,16 +1115,13 @@ int mesh_nexthop_resolve(struct ieee8021 +@@ -1122,16 +1122,13 @@ int mesh_nexthop_resolve(struct ieee8021 struct mesh_path *mpath; struct sk_buff *skb_to_free = NULL; u8 *target_addr = hdr->addr3; @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* no nexthop found, start resolving */ mpath = mesh_path_lookup(sdata, target_addr); -@@ -1132,8 +1129,7 @@ int mesh_nexthop_resolve(struct ieee8021 +@@ -1139,8 +1136,7 @@ int mesh_nexthop_resolve(struct ieee8021 mpath = mesh_path_add(sdata, target_addr); if (IS_ERR(mpath)) { mesh_path_discard_frame(sdata, skb); @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } } -@@ -1147,13 +1143,10 @@ int mesh_nexthop_resolve(struct ieee8021 +@@ -1154,13 +1150,10 @@ int mesh_nexthop_resolve(struct ieee8021 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; ieee80211_set_qos_hdr(sdata, skb); skb_queue_tail(&mpath->frame_queue, skb); @@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /** -@@ -1173,13 +1166,10 @@ int mesh_nexthop_lookup(struct ieee80211 +@@ -1180,13 +1173,10 @@ int mesh_nexthop_lookup(struct ieee80211 struct sta_info *next_hop; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; u8 *target_addr = hdr->addr3; @@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (time_after(jiffies, mpath->exp_time - -@@ -1194,12 +1184,10 @@ int mesh_nexthop_lookup(struct ieee80211 +@@ -1201,12 +1191,10 @@ int mesh_nexthop_lookup(struct ieee80211 memcpy(hdr->addr1, next_hop->sta.addr, ETH_ALEN); memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN); ieee80211_mps_set_frame_flags(sdata, next_hop, hdr); |