From e7085b58aa2a24c63103c7b0a4ed46f389743ade Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 10 Jul 2010 00:49:29 +0000 Subject: [PATCH] [backfire] merge b44 spam fix from r22110 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22111 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.32/211-b44_timeout_spam.patch | 17 +++++++++++++++++ .../813-use_netdev_alloc_skb.patch | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch diff --git a/target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch new file mode 100644 index 000000000..dbd46aee6 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch @@ -0,0 +1,17 @@ +--- a/drivers/net/b44.c ++++ b/drivers/net/b44.c +@@ -189,11 +189,13 @@ static int b44_wait_bit(struct b44 *bp, + udelay(10); + } + if (i == timeout) { +- printk(KERN_ERR PFX "%s: BUG! Timeout waiting for bit %08x of register " ++#if 0 ++ printk(KERN_DEBUG PFX "%s: BUG! Timeout waiting for bit %08x of register " + "%lx to %s.\n", + bp->dev->name, + bit, reg, + (clear ? "clear" : "set")); ++#endif + return -ENODEV; + } + return 0; diff --git a/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch b/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch index a9b2db586..2cfa824cc 100644 --- a/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch +++ b/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -848,7 +848,7 @@ static int b44_rx(struct b44 *bp, int bu +@@ -850,7 +850,7 @@ static int b44_rx(struct b44 *bp, int bu struct sk_buff *copy_skb; b44_recycle_rx(bp, cons, bp->rx_prod); -- 2.35.1