summaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-04-30 06:50:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-04-30 06:50:55 +0000
commit56350924f1206ad8e2d6c603c8b437395841a8e0 (patch)
treed4a7087e887d24e6b48d40e152359afc0234e0b7 /main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
parentf26af8bcd27eadc735bbdd7ccf437899d730267a (diff)
downloadaports-56350924f1206ad8e2d6c603c8b437395841a8e0.tar.bz2
aports-56350924f1206ad8e2d6c603c8b437395841a8e0.tar.xz
main/linux-grsec: upgrade to 2.1.14-2.6.32.12-201004292005
the 0006 and 0008 patch was applied upstream
Diffstat (limited to 'main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch')
-rw-r--r--main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch b/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
deleted file mode 100644
index dff3fd211..000000000
--- a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d1c9ac562923fa0b1738fceb4c7bafac3ab936ba Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Thu, 1 Apr 2010 07:30:07 +0000
-Subject: [PATCH 08/18] r8169: clean up my printk uglyness
-
-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 <nhorman@tuxdriver.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e)
----
- drivers/net/r8169.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index bed1d47..790555e 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
- 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;
- }
---
-1.7.0.2
-