From 0e8fbf9d05d5964b747ef14456e377c1601c77cf Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 26 Apr 2012 04:05:57 +0000 Subject: [PATCH] brcmsmac: "INTERMEDIATE but not AMPDU" only when tracing svn path=/dists/sid/linux-2.6/; revision=18953 --- debian/changelog | 1 + ...DIATE-but-not-AMPDU-only-when-tracin.patch | 42 +++++++++++++++++++ debian/patches/series/base | 1 + 3 files changed, 44 insertions(+) create mode 100644 debian/patches/bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch diff --git a/debian/changelog b/debian/changelog index 392999033..3e6988a50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux-2.6 (3.2.16-1) UNRELEASED; urgency=low [ Ben Hutchings ] * rt2x00: Identify rt2800usb chipsets. (Closes: #658067) * [x86] Add EFI boot stub support (Closes: #669033) + * brcmsmac: "INTERMEDIATE but not AMPDU" only when tracing -- Ben Hutchings Mon, 16 Apr 2012 02:27:29 +0100 diff --git a/debian/patches/bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch b/debian/patches/bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch new file mode 100644 index 000000000..3d36af9fc --- /dev/null +++ b/debian/patches/bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch @@ -0,0 +1,42 @@ +From: Eldad Zack +Date: Sun, 22 Apr 2012 00:48:04 +0200 +Subject: [PATCH] brcmsmac: "INTERMEDIATE but not AMPDU" only when tracing + +commit 6ead629b27269c553c9092c47cd8f5ab0309ee3b upstream. + +I keep getting the following messages on the log buffer: +[ 2167.097507] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU +[ 2281.331305] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU +[ 2281.332539] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU +[ 2329.876605] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU +[ 2329.877354] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU +[ 2462.280756] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU +[ 2615.651689] ieee80211 phy0: brcms_c_dotxstatus: INTERMEDIATE but not AMPDU + +From the code comment I understand that this something that can - +and does, quite frequently - happen. + +Signed-off-by: Eldad Zack +Acked-by: Franky Lin +Signed-off-by: John W. Linville +--- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c +index 7083db7..b4d9279 100644 +--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c ++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c +@@ -847,8 +847,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) + */ + if (!(txs->status & TX_STATUS_AMPDU) + && (txs->status & TX_STATUS_INTERMEDIATE)) { +- wiphy_err(wlc->wiphy, "%s: INTERMEDIATE but not AMPDU\n", +- __func__); ++ BCMMSG(wlc->wiphy, "INTERMEDIATE but not AMPDU\n"); + return false; + } + +-- +1.7.10 + diff --git a/debian/patches/series/base b/debian/patches/series/base index 0a0cdd5b9..0a5f10d67 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -183,3 +183,4 @@ + features/x86/efi-stub/0009-x86-efi-EFI-boot-stub-support.patch + features/x86/efi-stub/0010-x86-efi-Break-up-large-initrd-reads.patch + features/x86/efi-stub/0011-x86-efi-Fix-pointer-math-issue-in-handle_ramdisks.patch ++ bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch