summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-10 12:01:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-10 12:01:11 +0000
commit06a40092a7cb5f88ead87a1403a2b2b6cd9d0dca (patch)
tree472334f7e4a0030e39de07379f28fbed25c84da3
parentdef8b2ad9a42926db0e4c6eeebd0b6ab95498acf (diff)
add oleg's fix for ethtool
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@819 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/linux/kernel-patches/203-net_core_dev_c.patch22
1 files changed, 16 insertions, 6 deletions
diff --git a/package/linux/kernel-patches/203-net_core_dev_c.patch b/package/linux/kernel-patches/203-net_core_dev_c.patch
index b2ebccc17..8ce40f879 100644
--- a/package/linux/kernel-patches/203-net_core_dev_c.patch
+++ b/package/linux/kernel-patches/203-net_core_dev_c.patch
@@ -1,14 +1,24 @@
---- linux-mips-cvs-21012005/net/core/dev.c 2004-04-16 05:14:21.000000000 +0200
-+++ linux-broadcom/net/core/dev.c 2005-01-26 20:06:32.000000000 +0100
-@@ -2295,6 +2295,7 @@
- }
+--- linux-2.4.30/net/core/dev.c 2005-04-04 05:42:20.000000000 +0400
++++ linux/net/core/dev.c 2005-05-10 14:49:27.809927172 +0400
+@@ -2216,6 +2220,9 @@
+ cmd == SIOCBONDSLAVEINFOQUERY ||
+ cmd == SIOCBONDINFOQUERY ||
+ cmd == SIOCBONDCHANGEACTIVE ||
++#ifdef CONFIG_BCM4710
++ cmd == SIOCETHTOOL ||
++#endif
+ cmd == SIOCGMIIPHY ||
+ cmd == SIOCGMIIREG ||
+ cmd == SIOCSMIIREG ||
+@@ -2312,6 +2319,7 @@
return ret;
-+#ifndef CONFIG_BCM4710
case SIOCETHTOOL:
++#ifndef CONFIG_BCM4710
dev_load(ifr.ifr_name);
rtnl_lock();
-@@ -2308,6 +2309,7 @@
+ ret = dev_ethtool(&ifr);
+@@ -2324,6 +2332,7 @@
ret = -EFAULT;
}
return ret;