mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-04 06:54:27 -05:00 
			
		
		
		
	This updates mac80211 to version 5.2-rc7, this contains all the changes to the wireless subsystem up to Linux 5.2-rc7. * The removed patches are applied upstream * b43 now uses kmod-lib-cordic * Update the nl80211.h file in iw to match backports version. * Remove the two backports from kernel 4.9, they were needed for mt76, but that can use the version from backports now, otherwise they collide and cause compile errors. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			66 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			66 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
--- a/drivers/net/wireless/ath/ath9k/debug.c
 | 
						|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
 | 
						|
@@ -1361,6 +1361,53 @@ void ath9k_deinit_debug(struct ath_softc
 | 
						|
 	ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
 | 
						|
 }
 | 
						|
 
 | 
						|
+static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
 | 
						|
+			     size_t count, loff_t *ppos)
 | 
						|
+{
 | 
						|
+	struct ath_softc *sc = file->private_data;
 | 
						|
+	struct ath_hw *ah = sc->sc_ah;
 | 
						|
+	struct ath_common *common = ath9k_hw_common(ah);
 | 
						|
+	int bytes = 0;
 | 
						|
+	int pos = *ppos;
 | 
						|
+	int size = 4096;
 | 
						|
+	u16 val;
 | 
						|
+	int i;
 | 
						|
+
 | 
						|
+	if (AR_SREV_9300_20_OR_LATER(ah))
 | 
						|
+		size = 16384;
 | 
						|
+
 | 
						|
+	if (*ppos < 0)
 | 
						|
+		return -EINVAL;
 | 
						|
+
 | 
						|
+	if (count > size - *ppos)
 | 
						|
+		count = size - *ppos;
 | 
						|
+
 | 
						|
+	for (i = *ppos / 2; count > 0; count -= bytes, *ppos += bytes, i++) {
 | 
						|
+		void *from = &val;
 | 
						|
+
 | 
						|
+		if (!common->bus_ops->eeprom_read(common, i, &val))
 | 
						|
+			val = 0xffff;
 | 
						|
+
 | 
						|
+		if (*ppos % 2) {
 | 
						|
+			from++;
 | 
						|
+			bytes = 1;
 | 
						|
+		} else if (count == 1) {
 | 
						|
+			bytes = 1;
 | 
						|
+		} else {
 | 
						|
+			bytes = 2;
 | 
						|
+		}
 | 
						|
+		copy_to_user(user_buf, from, bytes);
 | 
						|
+		user_buf += bytes;
 | 
						|
+	}
 | 
						|
+	return *ppos - pos;
 | 
						|
+}
 | 
						|
+
 | 
						|
+static const struct file_operations fops_eeprom = {
 | 
						|
+	.read = read_file_eeprom,
 | 
						|
+	.open = simple_open,
 | 
						|
+	.owner = THIS_MODULE
 | 
						|
+};
 | 
						|
+
 | 
						|
 int ath9k_init_debug(struct ath_hw *ah)
 | 
						|
 {
 | 
						|
 	struct ath_common *common = ath9k_hw_common(ah);
 | 
						|
@@ -1380,6 +1427,8 @@ int ath9k_init_debug(struct ath_hw *ah)
 | 
						|
 	ath9k_tx99_init_debug(sc);
 | 
						|
 	ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
 | 
						|
 
 | 
						|
+	debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
 | 
						|
+			    &fops_eeprom);
 | 
						|
 	debugfs_create_devm_seqfile(sc->dev, "dma", sc->debug.debugfs_phy,
 | 
						|
 				    read_file_dma);
 | 
						|
 	debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
 |