fix oops in ethtool, from Willy Tarreau

diff --git a/queue-2.6.17/2-oopses-in-ethtool.patch b/queue-2.6.17/2-oopses-in-ethtool.patch
new file mode 100644 (file)
index 0000000..65dbe06
--- /dev/null
+++ b/queue-2.6.17/2-oopses-in-ethtool.patch
@@ -0,0 +1,33 @@
+From stable-bounces@linux.kernel.org  Wed Jul  5 13:48:03 2006
+Date: Wed, 5 Jul 2006 22:47:06 +0200
+From: Willy Tarreau <w@1wt.eu>
+To: marcelo@kvack.org, davem@davemloft.net
+Cc: stable@kernel.org, linux-kernel@vger.kernel.org, matthew@wil.cx
+Subject: [stable] [PATCH-2.4] 2 oopses in ethtool
+
+From: Willy Tarreau <willy@wtap.(none)>
+Date: Wed, 5 Jul 2006 22:34:52 +0200
+Subject: [PATCH] ethtool: oops in ethtool_set_pauseparam()
+
+The function pointers which were checked were for their get_* counterparts.
+Typically a copy-paste typo.
+
+Signed-off-by: Willy Tarreau <w@1wt.eu>
+Acked-by: Jeff Garzik <jeff@garzik.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ net/core/ethtool.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.17.3.orig/net/core/ethtool.c
++++ linux-2.6.17.3/net/core/ethtool.c
+@@ -437,7 +437,7 @@ static int ethtool_set_pauseparam(struct
+ {
+       struct ethtool_pauseparam pauseparam;
+ 
+-      if (!dev->ethtool_ops->get_pauseparam)
++      if (!dev->ethtool_ops->set_pauseparam)
+               return -EOPNOTSUPP;
+ 
+       if (copy_from_user(&pauseparam, useraddr, sizeof(pauseparam)))

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
index d11f2424c4d151ef308f585a2a33dde711685736..11d96935a324c57faf75fe90ba018b29b37e2edd 100644 (file)
--- a/queue-2.6.17/series
+++ b/queue-2.6.17/series
@@ -9,3 +9,4 @@ dvb-fix-ci-interface-on-pro-knc1-cards.patch
 pnp-suppress-request_irq-warning.patch
 reduce-acpi-verbosity-on-null-handle-condition.patch
 via-velocity-the-link-is-not-correctly-detected-when-the-device-starts.patch
+2-oopses-in-ethtool.patch