diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 11:12:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 11:12:51 +0000 |
| commit | b798df3e960f6bcb4910a4bee447ccadc0bb7d97 (patch) | |
| tree | a256166036fffae990f5120e9956e16f615f1920 /package/kernel/mac80211/patches/350-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch | |
| parent | fe2deddd963b480b2a957698bc9e193aef66a4ec (diff) | |
| download | master-187ad058-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.tar.gz master-187ad058-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.tar.bz2 master-187ad058-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.zip | |
mac80211: merge a few pending upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43208 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/350-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/350-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/350-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch b/package/kernel/mac80211/patches/350-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch new file mode 100644 index 0000000000..30b3dcffad --- /dev/null +++ b/package/kernel/mac80211/patches/350-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch @@ -0,0 +1,33 @@ +From: Ben Greear <greearb@candelatech.com> +Date: Tue, 4 Nov 2014 15:22:49 -0800 +Subject: [PATCH] ath9k: fix misc debugfs when not using chan context + +When channel-context is not enabled, all vifs belong to +the first context, but it is not configured as 'assigned'. + +Fix misc debugfs file to print out info for non-assigned +contexts, and also print whether ctx is assigned or not. + +Signed-off-by: Ben Greear <greearb@candelatech.com> +--- + +--- a/drivers/net/wireless/ath/ath9k/debug.c ++++ b/drivers/net/wireless/ath/ath9k/debug.c +@@ -828,13 +828,14 @@ static ssize_t read_file_misc(struct fil + + i = 0; + ath_for_each_chanctx(sc, ctx) { +- if (!ctx->assigned || list_empty(&ctx->vifs)) ++ if (list_empty(&ctx->vifs)) + continue; + ath9k_calculate_iter_data(sc, ctx, &iter_data); + + len += scnprintf(buf + len, sizeof(buf) - len, +- "VIF-COUNTS: CTX %i AP: %i STA: %i MESH: %i WDS: %i", +- i++, iter_data.naps, iter_data.nstations, ++ "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i", ++ i++, (int)(ctx->assigned), iter_data.naps, ++ iter_data.nstations, + iter_data.nmeshes, iter_data.nwds); + len += scnprintf(buf + len, sizeof(buf) - len, + " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n", |