From 4ad74dc6eb9b6cea6c1e2fa10872dd5cbb1782ee Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 15 Sep 2010 13:43:34 -0700 Subject: [PATCH] compat-wireless: make patch apply again. Signed-off-by: Hauke Mehrtens --- ...-debugfs-interface-to-dump-registers.patch | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch index d236c46f6263..a6c6d3e8e9e9 100644 --- a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch +++ b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch @@ -42,13 +42,10 @@ Signed-off-by: Felix Fietkau #ifdef CONFIG_ATH_DEBUG static ssize_t read_file_debug(struct file *file, char __user *user_buf, -@@ -893,7 +907,38 @@ static ssize_t write_file_regval(struct - static const struct file_operations fops_regval = { - .read = read_file_regval, - .write = write_file_regval, -- .open = ath9k_debugfs_open, -+}; -+ +@@ -908,6 +922,40 @@ static const struct file_operations fops + .llseek = default_llseek,/* read accesses f_pos */ + }; + +#define REGDUMP_LINE_SIZE 20 +#define REGDUMP_NUM_REGS (0x16bd4 / 4 + 1) +#define REGDUMP_DATA_LEN (REGDUMP_NUM_REGS * REGDUMP_LINE_SIZE + 1) @@ -79,10 +76,14 @@ Signed-off-by: Felix Fietkau + .open = open_file_regdump, + .read = ath9k_debugfs_read_buf, + .release = ath9k_debugfs_release_buf, - .owner = THIS_MODULE - }; - -@@ -961,6 +1006,11 @@ int ath9k_init_debug(struct ath_hw *ah) ++ .owner = THIS_MODULE, ++ .llseek = default_llseek,/* read accesses f_pos */ ++}; ++ + int ath9k_init_debug(struct ath_hw *ah) + { + struct ath_common *common = ath9k_hw_common(ah); +@@ -972,6 +1020,11 @@ int ath9k_init_debug(struct ath_hw *ah) goto err; sc->debug.regidx = 0; @@ -94,7 +95,7 @@ Signed-off-by: Felix Fietkau return 0; err: ath9k_exit_debug(ah); -@@ -972,6 +1022,7 @@ void ath9k_exit_debug(struct ath_hw *ah) +@@ -983,6 +1036,7 @@ void ath9k_exit_debug(struct ath_hw *ah) struct ath_common *common = ath9k_hw_common(ah); struct ath_softc *sc = (struct ath_softc *) common->priv; -- 2.30.2