From: Greg Kroah-Hartman Date: Fri, 23 Apr 2010 15:58:20 +0000 (-0700) Subject: printk fix for .32 X-Git-Tag: v2.6.32.12~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=274228049858b717da530dcb50e2c073eefdc804;p=thirdparty%2Fkernel%2Fstable-queue.git printk fix for .32 --- diff --git a/review-2.6.32/r8169-clean-up-my-printk-uglyness.patch b/review-2.6.32/r8169-clean-up-my-printk-uglyness.patch new file mode 100644 index 00000000000..d85ce46c360 --- /dev/null +++ b/review-2.6.32/r8169-clean-up-my-printk-uglyness.patch @@ -0,0 +1,36 @@ +From 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Thu, 1 Apr 2010 07:30:07 +0000 +Subject: r8169: clean up my printk uglyness + +From: Neil Horman + +commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e upstream. + +Fix formatting on r8169 printk + +Brandon Philips noted that I had a spacing issue in my printk for the +last r8169 patch that made it quite ugly. Fix that up and add the PFX +macro to it as well so it looks like the other r8169 printks + +Signed-off-by: Neil Horman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/r8169.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct + unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; + + if (max_frame != 16383) +- printk(KERN_WARNING "WARNING! Changing of MTU on this NIC" +- "May lead to frame reception errors!\n"); ++ printk(KERN_WARNING PFX "WARNING! Changing of MTU on this " ++ "NIC may lead to frame reception errors!\n"); + + tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE; + } diff --git a/review-2.6.32/series b/review-2.6.32/series index 7807ff00e11..c72c22cb689 100644 --- a/review-2.6.32/series +++ b/review-2.6.32/series @@ -195,3 +195,4 @@ sched-use-proper-type-in-sched_getaffinity.patch x86-gart-disable-gart-explicitly-before-initialization.patch mips-uasm-add-or-instruction.patch mips-sibyte-fix-m3-tlb-exception-handler-workaround.patch +r8169-clean-up-my-printk-uglyness.patch