*** empty log message ***

[openwrt.git] / target / linux / linux-2.4 / patches / 002-wl_fix.patch

diff --git a/target/linux/linux-2.4/patches/002-wl_fix.patch b/target/linux/linux-2.4/patches/002-wl_fix.patch
index e44a80b..ffb82aa 100644 (file)
--- a/target/linux/linux-2.4/patches/002-wl_fix.patch
+++ b/target/linux/linux-2.4/patches/002-wl_fix.patch
@@ -10,18 +10,13 @@ diff -Nur linux-2.4.30/include/linux/netdevice.h linux-2.4.30-wl-fix/include/lin
  
        /*
         * This marks the end of the "visible" part of the structure. All
-@@ -353,7 +353,14 @@
+@@ -352,8 +355,8 @@
+ 
        struct Qdisc            *qdisc;
        struct Qdisc            *qdisc_sleeping;
++      struct Qdisc            *qdisc_list;
        struct Qdisc            *qdisc_ingress;
-+      /*
-+       * this is needed for the wlan driver binary blob from linksys
-+       */
-+#ifdef CONFIG_BCM4710
-+      struct Qdisc            *qdisc_list;
-+#else
-       struct list_head        qdisc_list;
-+#endif
+-      struct list_head        qdisc_list;
        unsigned long           tx_queue_len;   /* Max frames per queue allowed */
  
        /* hard_start_xmit synchronizer */
@@ -330,3 +325,22 @@ diff -Nur linux-2.4.30/net/sched/sch_generic.c linux-2.4.30-wl-fix/net/sched/sch
        BUG_TRAP(!timer_pending(&dev->watchdog_timer));
        spin_unlock_bh(&dev->queue_lock);
        write_unlock(&qdisc_tree_lock);
+diff -urN linux.old/net/core/dev.c linux.dev/net/core/dev.c
+--- linux.old/net/core/dev.c   2005-05-28 17:42:07.000000000 +0200
++++ linux.dev/net/core/dev.c   2005-05-28 20:38:06.000000000 +0200
+@@ -2223,6 +2223,7 @@
+                           cmd == SIOCGMIIPHY ||
+                           cmd == SIOCGMIIREG ||
+                           cmd == SIOCSMIIREG ||
++                          cmd == SIOCETHTOOL ||
+                           cmd == SIOCWANDEV) {
+                               if (dev->do_ioctl) {
+                                       if (!netif_device_present(dev))
+@@ -2405,6 +2406,7 @@
+                
+               default:
+                       if (cmd == SIOCWANDEV ||
++                          (cmd == SIOCETHTOOL) ||
+                           (cmd >= SIOCDEVPRIVATE &&
+                            cmd <= SIOCDEVPRIVATE + 15)) {
+                               dev_load(ifr.ifr_name);