This updates mac80211 to backports based on kernel 5.4-rc2 ath10k-ct was updated to match the API changes and iw now uses the new nl80211.h header file. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			54 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			54 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 79c9d7aabae1d1da9eea97d83b61e1517a8a2221 Mon Sep 17 00:00:00 2001
 | 
						|
From: Mathias Kresin <dev@kresin.me>
 | 
						|
Date: Fri, 22 Jun 2018 18:59:44 +0200
 | 
						|
Subject: [PATCH] ath10k: use tpt LED trigger by default
 | 
						|
 | 
						|
Use the tpt LED trigger for each created phy led. Ths way LEDs attached
 | 
						|
to the ath10k GPIO pins are indicating the phy status and blink on
 | 
						|
traffic.
 | 
						|
 | 
						|
Signed-off-by: Mathias Kresin <dev@kresin.me>
 | 
						|
---
 | 
						|
 drivers/net/wireless/ath/ath10k/core.h | 4 ++++
 | 
						|
 drivers/net/wireless/ath/ath10k/leds.c | 4 +---
 | 
						|
 drivers/net/wireless/ath/ath10k/mac.c  | 2 +-
 | 
						|
 3 files changed, 6 insertions(+), 4 deletions(-)
 | 
						|
 | 
						|
--- a/drivers/net/wireless/ath/ath10k/core.h
 | 
						|
+++ b/drivers/net/wireless/ath/ath10k/core.h
 | 
						|
@@ -1219,6 +1219,10 @@ struct ath10k {
 | 
						|
 	struct ath10k_bus_params bus_param;
 | 
						|
 	struct completion peer_delete_done;
 | 
						|
 
 | 
						|
+#ifdef CPTCFG_MAC80211_LEDS
 | 
						|
+	const char *led_default_trigger;
 | 
						|
+#endif
 | 
						|
+
 | 
						|
 	/* must be last */
 | 
						|
 	u8 drv_priv[0] __aligned(sizeof(void *));
 | 
						|
 };
 | 
						|
--- a/drivers/net/wireless/ath/ath10k/leds.c
 | 
						|
+++ b/drivers/net/wireless/ath/ath10k/leds.c
 | 
						|
@@ -81,9 +81,7 @@ int ath10k_leds_register(struct ath10k *
 | 
						|
 
 | 
						|
 	ar->leds.cdev.name = ar->leds.label;
 | 
						|
 	ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;
 | 
						|
-
 | 
						|
-	/* FIXME: this assignment doesn't make sense as it's NULL, remove it? */
 | 
						|
-	ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger;
 | 
						|
+	ar->leds.cdev.default_trigger = ar->led_default_trigger;
 | 
						|
 
 | 
						|
 	ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev);
 | 
						|
 	if (ret)
 | 
						|
--- a/drivers/net/wireless/ath/ath10k/mac.c
 | 
						|
+++ b/drivers/net/wireless/ath/ath10k/mac.c
 | 
						|
@@ -9029,7 +9029,7 @@ int ath10k_mac_register(struct ath10k *a
 | 
						|
 	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
 | 
						|
 
 | 
						|
 #ifdef CPTCFG_MAC80211_LEDS
 | 
						|
-	ieee80211_create_tpt_led_trigger(ar->hw,
 | 
						|
+	ar->led_default_trigger = ieee80211_create_tpt_led_trigger(ar->hw,
 | 
						|
 		IEEE80211_TPT_LEDTRIG_FL_RADIO, ath10k_tpt_blink,
 | 
						|
 		ARRAY_SIZE(ath10k_tpt_blink));
 | 
						|
 #endif
 |