| developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame^] | 1 | From 03e816970e354ae3521f94dc56b94e2ff046a305 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sujuan Chen <sujuan.chen@mediatek.com> |
| 3 | Date: Fri, 11 Mar 2022 11:34:11 +0800 |
| 4 | Subject: [PATCH] mask kernel version limitation and fill forward path in |
| 5 | kernel 5.4 |
| 6 | |
| 7 | Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com> |
| 8 | --- |
| 9 | include/net/mac80211.h | 2 -- |
| 10 | net/mac80211/driver-ops.h | 2 -- |
| 11 | net/mac80211/iface.c | 4 ---- |
| 12 | net/mac80211/trace.h | 2 -- |
| 13 | 4 files changed, 10 deletions(-) |
| 14 | |
| 15 | diff --git a/include/net/mac80211.h b/include/net/mac80211.h |
| 16 | index 54df8c4..0fb2de9 100644 |
| 17 | --- a/include/net/mac80211.h |
| 18 | +++ b/include/net/mac80211.h |
| 19 | @@ -4279,13 +4279,11 @@ struct ieee80211_ops { |
| 20 | struct ieee80211_sta *sta, u8 flowid); |
| 21 | int (*set_radar_background)(struct ieee80211_hw *hw, |
| 22 | struct cfg80211_chan_def *chandef); |
| 23 | -#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 24 | int (*net_fill_forward_path)(struct ieee80211_hw *hw, |
| 25 | struct ieee80211_vif *vif, |
| 26 | struct ieee80211_sta *sta, |
| 27 | struct net_device_path_ctx *ctx, |
| 28 | struct net_device_path *path); |
| 29 | -#endif |
| 30 | }; |
| 31 | |
| 32 | /** |
| 33 | diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h |
| 34 | index 5c4adca..ce90549 100644 |
| 35 | --- a/net/mac80211/driver-ops.h |
| 36 | +++ b/net/mac80211/driver-ops.h |
| 37 | @@ -1483,7 +1483,6 @@ static inline void drv_twt_teardown_request(struct ieee80211_local *local, |
| 38 | trace_drv_return_void(local); |
| 39 | } |
| 40 | |
| 41 | -#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 42 | static inline int drv_net_fill_forward_path(struct ieee80211_local *local, |
| 43 | struct ieee80211_sub_if_data *sdata, |
| 44 | struct ieee80211_sta *sta, |
| 45 | @@ -1505,6 +1504,5 @@ static inline int drv_net_fill_forward_path(struct ieee80211_local *local, |
| 46 | |
| 47 | return ret; |
| 48 | } |
| 49 | -#endif |
| 50 | |
| 51 | #endif /* __MAC80211_DRIVER_OPS */ |
| 52 | diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c |
| 53 | index 6a44826..98b6d1c 100644 |
| 54 | --- a/net/mac80211/iface.c |
| 55 | +++ b/net/mac80211/iface.c |
| 56 | @@ -822,7 +822,6 @@ static const struct net_device_ops ieee80211_monitorif_ops = { |
| 57 | |
| 58 | }; |
| 59 | |
| 60 | -#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 61 | static int ieee80211_netdev_fill_forward_path(struct net_device_path_ctx *ctx, |
| 62 | struct net_device_path *path) |
| 63 | { |
| 64 | @@ -880,7 +879,6 @@ out: |
| 65 | |
| 66 | return ret; |
| 67 | } |
| 68 | -#endif |
| 69 | |
| 70 | static const struct net_device_ops ieee80211_dataif_8023_ops = { |
| 71 | #if LINUX_VERSION_IS_LESS(4,10,0) |
| 72 | @@ -899,9 +897,7 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = { |
| 73 | #else |
| 74 | .ndo_get_stats64 = bp_ieee80211_get_stats64, |
| 75 | #endif |
| 76 | -#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 77 | .ndo_fill_forward_path = ieee80211_netdev_fill_forward_path, |
| 78 | -#endif |
| 79 | }; |
| 80 | |
| 81 | static bool ieee80211_iftype_supports_hdr_offload(enum nl80211_iftype iftype) |
| 82 | diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h |
| 83 | index bbda9e9..d91498f 100644 |
| 84 | --- a/net/mac80211/trace.h |
| 85 | +++ b/net/mac80211/trace.h |
| 86 | @@ -2892,14 +2892,12 @@ TRACE_EVENT(drv_twt_teardown_request, |
| 87 | ) |
| 88 | ); |
| 89 | |
| 90 | -#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 91 | DEFINE_EVENT(sta_event, drv_net_fill_forward_path, |
| 92 | TP_PROTO(struct ieee80211_local *local, |
| 93 | struct ieee80211_sub_if_data *sdata, |
| 94 | struct ieee80211_sta *sta), |
| 95 | TP_ARGS(local, sdata, sta) |
| 96 | ); |
| 97 | -#endif |
| 98 | |
| 99 | #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */ |
| 100 | |
| 101 | -- |
| 102 | 2.18.0 |
| 103 | |