blob: 8d2067fc590d33f1a1ce2283b1615177603f2cb2 [file] [log] [blame]
developeraab83332023-03-07 18:17:19 +08001From 2a801c07d58b8c9b9d5e9049856c7ef7b504d841 Mon Sep 17 00:00:00 2001
developer4a339e82022-12-12 19:00:30 +08002From: Sujuan Chen <sujuan.chen@mediatek.com>
3Date: Wed, 18 May 2022 15:10:22 +0800
developeraab83332023-03-07 18:17:19 +08004Subject: [PATCH 13/19] mac80211: mtk: add fill receive path ops to get wed idx
developer4a339e82022-12-12 19:00:30 +08005
6Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
7---
8 include/net/mac80211.h | 15 +++++++++++++--
9 net/mac80211/driver-ops.h | 13 +++++++++++++
10 net/mac80211/iface.c | 24 ++++++++++++++++++++++++
11 net/mac80211/util.c | 9 +++++++++
12 4 files changed, 59 insertions(+), 2 deletions(-)
13 mode change 100644 => 100755 net/mac80211/util.c
14
15diff --git a/include/net/mac80211.h b/include/net/mac80211.h
developeraab83332023-03-07 18:17:19 +080016index ad5f217..d1d7fc3 100644
developer4a339e82022-12-12 19:00:30 +080017--- a/include/net/mac80211.h
18+++ b/include/net/mac80211.h
developeraab83332023-03-07 18:17:19 +080019@@ -1380,7 +1380,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
developer4a339e82022-12-12 19:00:30 +080020 * @RX_FLAG_AMPDU_EOF_BIT_KNOWN: The EOF value is known
21 * @RX_FLAG_RADIOTAP_HE: HE radiotap data is present
22 * (&struct ieee80211_radiotap_he, mac80211 will fill in
23- *
24+ *
25 * - DATA3_DATA_MCS
26 * - DATA3_DATA_DCM
27 * - DATA3_CODING
developeraab83332023-03-07 18:17:19 +080028@@ -1388,7 +1388,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
developer4a339e82022-12-12 19:00:30 +080029 * - DATA5_DATA_BW_RU_ALLOC
30 * - DATA6_NSTS
31 * - DATA3_STBC
32- *
33+ *
34 * from the RX info data, so leave those zeroed when building this data)
35 * @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present
36 * (&struct ieee80211_radiotap_he_mu)
developeraab83332023-03-07 18:17:19 +080037@@ -1950,6 +1950,12 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
developer4a339e82022-12-12 19:00:30 +080038 */
39 struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif);
40
41+/**
42+ * ieee80211_vif_to_wdev - return a net_device struct from a vif
43+ * @vif: the vif to get the net_device for
44+ */
45+struct net_device *ieee80211_vif_to_netdev(struct ieee80211_vif *vif);
46+
47 /**
48 * lockdep_vif_mutex_held - for lockdep checks on link poiners
49 * @vif: the interface to check
developeraab83332023-03-07 18:17:19 +080050@@ -4219,6 +4225,8 @@ struct ieee80211_prep_tx_info {
developer4a339e82022-12-12 19:00:30 +080051 * Note that a sta can also be inserted or removed with valid links,
52 * i.e. passed to @sta_add/@sta_state with sta->valid_links not zero.
53 * In fact, cannot change from having valid_links and not having them.
54+ * @net_fill_receive_path: Called from .ndo_fill_receive_path in order to
55+ * get a path for hardware flow offloading
56 */
57 struct ieee80211_ops {
58 void (*tx)(struct ieee80211_hw *hw,
developeraab83332023-03-07 18:17:19 +080059@@ -4574,6 +4582,9 @@ struct ieee80211_ops {
developer4a339e82022-12-12 19:00:30 +080060 struct ieee80211_vif *vif,
61 struct ieee80211_sta *sta,
62 u16 old_links, u16 new_links);
63+ int (*net_fill_receive_path)(struct ieee80211_hw *hw,
64+ struct net_device_path_ctx *ctx,
65+ struct net_device_path *path);
66 };
67
68 /**
69diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
70index 3d16b09..bbecd2e 100644
71--- a/net/mac80211/driver-ops.h
72+++ b/net/mac80211/driver-ops.h
73@@ -1479,4 +1479,17 @@ int drv_change_sta_links(struct ieee80211_local *local,
74 struct ieee80211_sta *sta,
75 u16 old_links, u16 new_links);
76
77+static inline int drv_net_fill_receive_path(struct ieee80211_local *local,
78+ struct net_device_path_ctx *ctx,
79+ struct net_device_path *path)
80+{
81+ int ret = -EOPNOTSUPP;
82+
83+ if (local->ops->net_fill_receive_path)
84+ ret = local->ops->net_fill_receive_path(&local->hw,
85+ ctx, path);
86+
87+ return ret;
88+}
89+
90 #endif /* __MAC80211_DRIVER_OPS */
91diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
developer1413c882023-02-15 00:01:06 +080092index 25a7545..6e76b23 100644
developer4a339e82022-12-12 19:00:30 +080093--- a/net/mac80211/iface.c
94+++ b/net/mac80211/iface.c
developer1413c882023-02-15 00:01:06 +080095@@ -920,6 +920,29 @@ out:
developer4a339e82022-12-12 19:00:30 +080096 return ret;
97 }
98
99+static int ieee80211_netdev_fill_receive_path(struct net_device_path_ctx *ctx,
100+ struct net_device_path *path)
101+{
102+ struct ieee80211_sub_if_data *sdata;
103+ struct ieee80211_local *local;
104+ int ret = -ENOENT;
105+
106+ sdata = IEEE80211_DEV_TO_SUB_IF(ctx->dev);
107+ local = sdata->local;
108+
109+ if (!local->ops->net_fill_receive_path)
110+ return -EOPNOTSUPP;
111+
112+ rcu_read_lock();
113+
114+ ret = drv_net_fill_receive_path(local, ctx, path);
115+
116+ rcu_read_unlock();
117+
118+ return ret;
119+}
120+
121+
122 static const struct net_device_ops ieee80211_dataif_8023_ops = {
123 .ndo_open = ieee80211_open,
124 .ndo_stop = ieee80211_stop,
developer1413c882023-02-15 00:01:06 +0800125@@ -929,6 +952,7 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = {
developer4a339e82022-12-12 19:00:30 +0800126 .ndo_set_mac_address = ieee80211_change_mac,
127 .ndo_get_stats64 = ieee80211_get_stats64,
128 .ndo_fill_forward_path = ieee80211_netdev_fill_forward_path,
129+ .ndo_fill_receive_path = ieee80211_netdev_fill_receive_path,
130 };
131
132 static bool ieee80211_iftype_supports_hdr_offload(enum nl80211_iftype iftype)
133diff --git a/net/mac80211/util.c b/net/mac80211/util.c
134old mode 100644
135new mode 100755
developer1413c882023-02-15 00:01:06 +0800136index 608f927..fd63ee3
developer4a339e82022-12-12 19:00:30 +0800137--- a/net/mac80211/util.c
138+++ b/net/mac80211/util.c
139@@ -914,6 +914,15 @@ struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif)
140 }
141 EXPORT_SYMBOL_GPL(ieee80211_vif_to_wdev);
142
143+struct net_device *ieee80211_vif_to_netdev(struct ieee80211_vif *vif)
144+{
145+ if (!vif)
146+ return NULL;
147+
148+ return vif_to_sdata(vif)->dev;
149+}
150+EXPORT_SYMBOL_GPL(ieee80211_vif_to_netdev);
151+
152 /*
153 * Nothing should have been stuffed into the workqueue during
154 * the suspend->resume cycle. Since we can't check each caller
155--
developeraab83332023-03-07 18:17:19 +08001562.18.0
developer4a339e82022-12-12 19:00:30 +0800157