Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
openwrt
openwrt
提交
92acd9f3
O
openwrt
项目概览
mirrors
/
openwrt
/
openwrt
10 个月 前同步成功
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openwrt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
92acd9f3
编写于
12月 16, 2022
作者:
F
Felix Fietkau
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mac80211: fix uninitialized variable in rx->link/link_sta initialization fix
Signed-off-by:
N
Felix Fietkau
<
nbd@nbd.name
>
上级
2fb38b77
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
23 deletion
+15
-23
package/kernel/mac80211/patches/subsys/307-wifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch
...ifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch
+15
-23
未找到文件。
package/kernel/mac80211/patches/subsys/307-wifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch
浏览文件 @
92acd9f3
...
...
@@ -186,15 +186,18 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
stats->dropped++;
return true;
@@ -4787,
7 +4813,6
@@
static bool ieee80211_prepare_and_rx_han
@@ -4787,
8 +4813,8
@@
static bool ieee80211_prepare_and_rx_han
struct ieee80211_local *local = rx->local;
struct ieee80211_sub_if_data *sdata = rx->sdata;
struct ieee80211_hdr *hdr = (void *)skb->data;
- struct link_sta_info *link_sta = NULL;
struct ieee80211_link_data *link;
- struct ieee80211_link_data *link;
+ struct link_sta_info *link_sta = rx->link_sta;
+ struct ieee80211_link_data *link = rx->link;
rx->skb = skb;
@@ -4810,35 +4835,6 @@
static bool ieee80211_prepare_and_rx_han
@@ -4810,35 +4836,6 @@
static bool ieee80211_prepare_and_rx_han
if (!ieee80211_accept_frame(rx))
return false;
...
...
@@ -230,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!consume) {
struct skb_shared_hwtstamps *shwt;
@@ -4858,
16 +4854,16
@@
static bool ieee80211_prepare_and_rx_han
@@ -4858,
7 +4855,7
@@
static bool ieee80211_prepare_and_rx_han
shwt->hwtstamp = skb_hwtstamps(skb)->hwtstamp;
}
...
...
@@ -239,18 +242,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* translate to MLD addresses */
if (ether_addr_equal(link->conf->addr, hdr->addr1))
ether_addr_copy(hdr->addr1, rx->sdata->vif.addr);
- if (ether_addr_equal(link_sta->addr, hdr->addr2))
+ if (ether_addr_equal(rx->link_sta->addr, hdr->addr2))
ether_addr_copy(hdr->addr2, rx->sta->addr);
/* translate A3 only if it's the BSSID */
if (!ieee80211_has_tods(hdr->frame_control) &&
!ieee80211_has_fromds(hdr->frame_control)) {
- if (ether_addr_equal(link_sta->addr, hdr->addr3))
+ if (ether_addr_equal(rx->link_sta->addr, hdr->addr3))
ether_addr_copy(hdr->addr3, rx->sta->addr);
else if (ether_addr_equal(link->conf->addr, hdr->addr3))
ether_addr_copy(hdr->addr3, rx->sdata->vif.addr);
@@ -4888,6 +4884,7 @@
static void __ieee80211_rx_handle_8023(s
@@ -4888,6 +4885,7 @@
static void __ieee80211_rx_handle_8023(s
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_fast_rx *fast_rx;
struct ieee80211_rx_data rx;
...
...
@@ -258,7 +250,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
memset(&rx, 0, sizeof(rx));
rx.skb = skb;
@@ -4904,12 +490
1
,8 @@
static void __ieee80211_rx_handle_8023(s
@@ -4904,12 +490
2
,8 @@
static void __ieee80211_rx_handle_8023(s
if (!pubsta)
goto drop;
...
...
@@ -273,7 +265,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* TODO: Should the frame be dropped if the right link_id is not
@@ -4918,19 +491
1
,8 @@
static void __ieee80211_rx_handle_8023(s
@@ -4918,19 +491
2
,8 @@
static void __ieee80211_rx_handle_8023(s
* link_id is used only for stats purpose and updating the stats on
* the deflink is fine?
*/
...
...
@@ -295,7 +287,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
fast_rx = rcu_dereference(rx.sta->fast_rx);
if (!fast_rx)
@@ -4948,6 +493
0
,8 @@
static bool ieee80211_rx_for_interface(s
@@ -4948,6 +493
1
,8 @@
static bool ieee80211_rx_for_interface(s
{
struct link_sta_info *link_sta;
struct ieee80211_hdr *hdr = (void *)skb->data;
...
...
@@ -304,7 +296,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Look up link station first, in case there's a
@@ -4957,24 +494
1
,19 @@
static bool ieee80211_rx_for_interface(s
@@ -4957,24 +494
2
,19 @@
static bool ieee80211_rx_for_interface(s
*/
link_sta = link_sta_info_get_bss(rx->sdata, hdr->addr2);
if (link_sta) {
...
...
@@ -337,7 +329,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return ieee80211_prepare_and_rx_handle(rx, skb, consume);
}
@@ -5033,19 +501
2
,15 @@
static void __ieee80211_rx_handle_packet
@@ -5033,19 +501
3
,15 @@
static void __ieee80211_rx_handle_packet
if (ieee80211_is_data(fc)) {
struct sta_info *sta, *prev_sta;
...
...
@@ -362,7 +354,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* In MLO connection, fetch the link_id using addr2
* when the driver does not pass link_id in status.
@@ -5063,7 +503
8
,7 @@
static void __ieee80211_rx_handle_packet
@@ -5063,7 +503
9
,7 @@
static void __ieee80211_rx_handle_packet
if (!link_sta)
goto out;
...
...
@@ -371,7 +363,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
@@ -5079,30 +505
4
,25 @@
static void __ieee80211_rx_handle_packet
@@ -5079,30 +505
5
,25 @@
static void __ieee80211_rx_handle_packet
continue;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录