summaryrefslogtreecommitdiffstats
path: root/linux-2.6-silence-noise.patch
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-05-30 07:23:14 -0400
committerKyle McMartin <kyle@redhat.com>2011-05-30 07:23:14 -0400
commit123d535ad8de98fe5fd368bea098100171fdfb97 (patch)
tree519e4e355539a65ca27c0321f3af048874314d4d /linux-2.6-silence-noise.patch
parentcbc61c988b303e7718d0e711e1c506b0700042f4 (diff)
downloadkernel-123d535ad8de98fe5fd368bea098100171fdfb97.tar.gz
kernel-123d535ad8de98fe5fd368bea098100171fdfb97.tar.xz
kernel-123d535ad8de98fe5fd368bea098100171fdfb97.zip
rebase and nuke patches
Diffstat (limited to 'linux-2.6-silence-noise.patch')
-rw-r--r--linux-2.6-silence-noise.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/linux-2.6-silence-noise.patch b/linux-2.6-silence-noise.patch
index 32c678b1f..6d25a8ff3 100644
--- a/linux-2.6-silence-noise.patch
+++ b/linux-2.6-silence-noise.patch
@@ -34,23 +34,24 @@ ratelimited. It isn't particularly useful, so just remove it.
Signed-off-by: Dave Jones <davej@redhat.com>
---- linux-2.6.27.noarch/net/can/af_can.c~ 2008-12-11 16:53:48.000000000 -0500
-+++ linux-2.6.27.noarch/net/can/af_can.c 2008-12-11 16:54:42.000000000 -0500
-@@ -134,13 +134,9 @@ static int can_create(struct net *net, s
+--- a/net/can/af_can.c
++++ b/net/can/af_can.c
+@@ -157,13 +157,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
err = request_module("can-proto-%d", protocol);
/*
- * In case of error we only print a message but don't
- * return the error code immediately. Below we will
- * return -EPROTONOSUPPORT
-+ * In case of error we don't return the error code immediately.
++ * In case of error we but don't return the error code immediately.
+ * Below we will return -EPROTONOSUPPORT
*/
- if (err && printk_ratelimit())
- printk(KERN_ERR "can: request_module "
- "(can-proto-%d) failed.\n", protocol);
+
+ cp = can_get_proto(protocol);
}
- #endif
This was removed in revision 1.6 of linux-2.6-silence-noise.patch
in ye olde CVS tree. I have no idea why. Originally the pr_debug in