blob: 0af68c30dfaab0316d1b4803cd8b8440334f994c [file] [log] [blame]
From ef1f8c941108eca2665a6caff0cd016c36584d76 Mon Sep 17 00:00:00 2001
From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
Date: Fri, 23 Jun 2023 05:53:50 +0800
Subject: [PATCH 29/37] mtk: mac80211: export ieee80211_tpt_led_trig_tx/rx for
driver
Whenever the H/W path is enabled and traffic is in the binding state,
mac80211 is not aware of the traffic. Consequently, the LED does not
blink for that reason.
The ieee80211_tpt_led_trig_tx/rx functions are exported for the driver
so that we can report the tx and rx bytes from the driver when
the H/W path is being used.
Signed-off-by: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
---
include/net/mac80211.h | 17 +++++++++++++++++
net/mac80211/led.c | 16 ++++++++++++++++
net/mac80211/led.h | 17 -----------------
net/mac80211/rx.c | 2 +-
net/mac80211/tx.c | 4 ++--
5 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 361fe92..d641b18 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4747,6 +4747,8 @@ __ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,
unsigned int flags,
const struct ieee80211_tpt_blink *blink_table,
unsigned int blink_table_len);
+void __ieee80211_tpt_led_trig_tx(struct ieee80211_hw *hw, int bytes);
+void __ieee80211_tpt_led_trig_rx(struct ieee80211_hw *hw, int bytes);
#endif
/**
* ieee80211_get_tx_led_name - get name of TX LED
@@ -4857,6 +4859,21 @@ ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw, unsigned int flags,
#endif
}
+static inline void
+ieee80211_tpt_led_trig_tx(struct ieee80211_hw *hw, int bytes)
+{
+#ifdef CPTCFG_MAC80211_LEDS
+ __ieee80211_tpt_led_trig_tx(hw, bytes);
+#endif
+}
+
+static inline void
+ieee80211_tpt_led_trig_rx(struct ieee80211_hw *hw, int bytes)
+{
+#ifdef CPTCFG_MAC80211_LEDS
+ __ieee80211_tpt_led_trig_rx(hw, bytes);
+#endif
+}
/**
* ieee80211_unregister_hw - Unregister a hardware device
*
diff --git a/net/mac80211/led.c b/net/mac80211/led.c
index c60d070..0ecc3ea 100644
--- a/net/mac80211/led.c
+++ b/net/mac80211/led.c
@@ -364,6 +364,22 @@ __ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,
}
EXPORT_SYMBOL(__ieee80211_create_tpt_led_trigger);
+void __ieee80211_tpt_led_trig_tx(struct ieee80211_hw *hw, int bytes)
+{
+ struct ieee80211_local *local = hw_to_local(hw);
+ if (atomic_read(&local->tpt_led_active))
+ local->tpt_led_trigger->tx_bytes += bytes;
+}
+EXPORT_SYMBOL(__ieee80211_tpt_led_trig_tx);
+
+void __ieee80211_tpt_led_trig_rx(struct ieee80211_hw *hw, int bytes)
+{
+ struct ieee80211_local *local = hw_to_local(hw);
+ if (atomic_read(&local->tpt_led_active))
+ local->tpt_led_trigger->rx_bytes += bytes;
+}
+EXPORT_SYMBOL(__ieee80211_tpt_led_trig_rx);
+
static void ieee80211_start_tpt_led_trig(struct ieee80211_local *local)
{
struct tpt_led_trigger *tpt_trig = local->tpt_led_trigger;
diff --git a/net/mac80211/led.h b/net/mac80211/led.h
index 59f5a83..f381790 100644
--- a/net/mac80211/led.h
+++ b/net/mac80211/led.h
@@ -65,22 +65,5 @@ static inline void ieee80211_mod_tpt_led_trig(struct ieee80211_local *local,
unsigned int types_off)
{
}
-#endif
-static inline void
-ieee80211_tpt_led_trig_tx(struct ieee80211_local *local, int bytes)
-{
-#ifdef CPTCFG_MAC80211_LEDS
- if (atomic_read(&local->tpt_led_active))
- local->tpt_led_trigger->tx_bytes += bytes;
#endif
-}
-
-static inline void
-ieee80211_tpt_led_trig_rx(struct ieee80211_local *local, int bytes)
-{
-#ifdef CPTCFG_MAC80211_LEDS
- if (atomic_read(&local->tpt_led_active))
- local->tpt_led_trigger->rx_bytes += bytes;
-#endif
-}
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index fead07e..1541e9c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -5401,7 +5401,7 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
if (skb) {
if ((status->flag & RX_FLAG_8023) ||
ieee80211_is_data_present(hdr->frame_control))
- ieee80211_tpt_led_trig_rx(local, skb->len);
+ ieee80211_tpt_led_trig_rx(&local->hw, skb->len);
if (status->flag & RX_FLAG_8023)
__ieee80211_rx_handle_8023(hw, pubsta, skb, list);
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 019fc77..c8fade8 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4323,7 +4323,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
len = 0;
out:
if (len)
- ieee80211_tpt_led_trig_tx(local, len);
+ ieee80211_tpt_led_trig_tx(&local->hw, len);
rcu_read_unlock();
}
@@ -4649,7 +4649,7 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,
sta->deflink.tx_stats.packets[queue] += skbs;
sta->deflink.tx_stats.bytes[queue] += len;
- ieee80211_tpt_led_trig_tx(local, len);
+ ieee80211_tpt_led_trig_tx(&local->hw, len);
ieee80211_tx_8023(sdata, skb, sta, false);
--
2.18.0