projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[ubicom32]: refresh patch
[openwrt.git] / target / linux / generic-2.4 / patches / 100-wireless-extension.patch
diff --git a/target/linux/generic-2.4/patches/100-wireless-extension.patch b/target/linux/generic-2.4/patches/100-wireless-extension.patch
index da65961..a4eee2d 100644 (file)
--- a/target/linux/generic-2.4/patches/100-wireless-extension.patch
+++ b/target/linux/generic-2.4/patches/100-wireless-extension.patch
@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/netdevice.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netdevice.h
-+++ linux-2.4.35.4/include/linux/netdevice.h
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
 @@ -295,7 +295,9 @@ struct net_device
  
        /* List of functions to handle Wireless Extensions (instead of ioctl).
 @@ -295,7 +295,9 @@ struct net_device
  
        /* List of functions to handle Wireless Extensions (instead of ioctl).
@@ -13,10 +11,8 @@ Index: linux-2.4.35.4/include/linux/netdevice.h
  
        struct ethtool_ops *ethtool_ops;
  
  
        struct ethtool_ops *ethtool_ops;
  
-Index: linux-2.4.35.4/include/linux/wireless.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/wireless.h
-+++ linux-2.4.35.4/include/linux/wireless.h
+--- a/include/linux/wireless.h
++++ b/include/linux/wireless.h
 @@ -1,10 +1,10 @@
  /*
   * This file define a set of standard wireless extensions
 @@ -1,10 +1,10 @@
  /*
   * This file define a set of standard wireless extensions
@@ -472,10 +468,8 @@ Index: linux-2.4.35.4/include/linux/wireless.h
  };
  
  /*
  };
  
  /*
-Index: linux-2.4.35.4/include/net/iw_handler.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/iw_handler.h
-+++ linux-2.4.35.4/include/net/iw_handler.h
+--- a/include/net/iw_handler.h
++++ b/include/net/iw_handler.h
 @@ -1,10 +1,10 @@
  /*
   * This file define the new driver API for Wireless Extensions
 @@ -1,10 +1,10 @@
  /*
   * This file define the new driver API for Wireless Extensions
@@ -593,10 +587,8 @@ Index: linux-2.4.35.4/include/net/iw_handler.h
  };
  
  /**************************** PROTOTYPES ****************************/
  };
  
  /**************************** PROTOTYPES ****************************/
-Index: linux-2.4.35.4/net/core/dev.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/dev.c
-+++ linux-2.4.35.4/net/core/dev.c
+--- a/net/core/dev.c
++++ b/net/core/dev.c
 @@ -2426,7 +2426,7 @@ int dev_ioctl(unsigned int cmd, void *ar
                                /* Follow me in net/core/wireless.c */
                                ret = wireless_process_ioctl(&ifr, cmd);
 @@ -2426,7 +2426,7 @@ int dev_ioctl(unsigned int cmd, void *ar
                                /* Follow me in net/core/wireless.c */
                                ret = wireless_process_ioctl(&ifr, cmd);
@@ -606,10 +598,8 @@ Index: linux-2.4.35.4/net/core/dev.c
                                    copy_to_user(arg, &ifr, sizeof(struct ifreq)))
                                        return -EFAULT;
                                return ret;
                                    copy_to_user(arg, &ifr, sizeof(struct ifreq)))
                                        return -EFAULT;
                                return ret;
-Index: linux-2.4.35.4/net/core/wireless.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/wireless.c
-+++ linux-2.4.35.4/net/core/wireless.c
+--- a/net/core/wireless.c
++++ b/net/core/wireless.c
 @@ -2,7 +2,7 @@
   * This file implement the Wireless Extensions APIs.
   *
 @@ -2,7 +2,7 @@
   * This file implement the Wireless Extensions APIs.
   *
@@ -922,7 +912,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
                        err = copy_to_user(iwr->u.data.pointer, extra,
                                           extra_size);
                        if (err)
                        err = copy_to_user(iwr->u.data.pointer, extra,
                                           extra_size);
                        if (err)
-@@ -1042,9 +1128,25 @@ void wireless_send_event(struct net_devi
+@@ -1043,9 +1129,25 @@ void wireless_send_event(struct net_devi
   * One of the main advantage of centralising spy support here is that
   * it becomes much easier to improve and extend it without having to touch
   * the drivers. One example is the addition of the Spy-Threshold events.
   * One of the main advantage of centralising spy support here is that
   * it becomes much easier to improve and extend it without having to touch
   * the drivers. One example is the addition of the Spy-Threshold events.
@@ -949,7 +939,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  /*------------------------------------------------------------------*/
  /*
   * Standard Wireless Handler : set Spy List
  /*------------------------------------------------------------------*/
  /*
   * Standard Wireless Handler : set Spy List
-@@ -1054,16 +1156,26 @@ int iw_handler_set_spy(struct net_device
+@@ -1055,16 +1157,26 @@ int iw_handler_set_spy(struct net_device
                       union iwreq_data *       wrqu,
                       char *                   extra)
  {
                       union iwreq_data *       wrqu,
                       char *                   extra)
  {
@@ -981,7 +971,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
        /* Are there are addresses to copy? */
        if(wrqu->data.length > 0) {
                int i;
        /* Are there are addresses to copy? */
        if(wrqu->data.length > 0) {
                int i;
-@@ -1089,13 +1201,14 @@ int iw_handler_set_spy(struct net_device
+@@ -1090,13 +1202,14 @@ int iw_handler_set_spy(struct net_device
                               spydata->spy_address[i][5]);
  #endif        /* WE_SPY_DEBUG */
        }
                               spydata->spy_address[i][5]);
  #endif        /* WE_SPY_DEBUG */
        }
@@ -999,7 +989,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  }
  
  /*------------------------------------------------------------------*/
  }
  
  /*------------------------------------------------------------------*/
-@@ -1107,12 +1220,14 @@ int iw_handler_get_spy(struct net_device
+@@ -1108,12 +1221,14 @@ int iw_handler_get_spy(struct net_device
                       union iwreq_data *       wrqu,
                       char *                   extra)
  {
                       union iwreq_data *       wrqu,
                       char *                   extra)
  {
@@ -1017,7 +1007,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
        wrqu->data.length = spydata->spy_number;
  
        /* Copy addresses. */
        wrqu->data.length = spydata->spy_number;
  
        /* Copy addresses. */
-@@ -1129,9 +1244,6 @@ int iw_handler_get_spy(struct net_device
+@@ -1130,9 +1245,6 @@ int iw_handler_get_spy(struct net_device
        for(i = 0; i < spydata->spy_number; i++)
                spydata->spy_stat[i].updated = 0;
        return 0;
        for(i = 0; i < spydata->spy_number; i++)
                spydata->spy_stat[i].updated = 0;
        return 0;
@@ -1027,7 +1017,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  }
  
  /*------------------------------------------------------------------*/
  }
  
  /*------------------------------------------------------------------*/
-@@ -1143,11 +1255,13 @@ int iw_handler_set_thrspy(struct net_dev
+@@ -1144,11 +1256,13 @@ int iw_handler_set_thrspy(struct net_dev
                          union iwreq_data *    wrqu,
                          char *                extra)
  {
                          union iwreq_data *    wrqu,
                          char *                extra)
  {
@@ -1044,7 +1034,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
        /* Just do it */
        memcpy(&(spydata->spy_thr_low), &(threshold->low),
               2 * sizeof(struct iw_quality));
        /* Just do it */
        memcpy(&(spydata->spy_thr_low), &(threshold->low),
               2 * sizeof(struct iw_quality));
-@@ -1160,9 +1274,6 @@ int iw_handler_set_thrspy(struct net_dev
+@@ -1161,9 +1275,6 @@ int iw_handler_set_thrspy(struct net_dev
  #endif        /* WE_SPY_DEBUG */
  
        return 0;
  #endif        /* WE_SPY_DEBUG */
  
        return 0;
@@ -1054,7 +1044,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  }
  
  /*------------------------------------------------------------------*/
  }
  
  /*------------------------------------------------------------------*/
-@@ -1174,22 +1285,20 @@ int iw_handler_get_thrspy(struct net_dev
+@@ -1175,22 +1286,20 @@ int iw_handler_get_thrspy(struct net_dev
                          union iwreq_data *    wrqu,
                          char *                extra)
  {
                          union iwreq_data *    wrqu,
                          char *                extra)
  {
@@ -1082,7 +1072,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  /*------------------------------------------------------------------*/
  /*
   * Prepare and send a Spy Threshold event
  /*------------------------------------------------------------------*/
  /*
   * Prepare and send a Spy Threshold event
-@@ -1227,7 +1336,6 @@ static void iw_send_thrspy_event(struct 
+@@ -1228,7 +1337,6 @@ static void iw_send_thrspy_event(struct 
        /* Send event to user space */
        wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
  }
        /* Send event to user space */
        wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
  }
@@ -1090,7 +1080,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  
  /* ---------------------------------------------------------------- */
  /*
  
  /* ---------------------------------------------------------------- */
  /*
-@@ -1240,12 +1348,14 @@ void wireless_spy_update(struct net_devi
+@@ -1241,12 +1349,14 @@ void wireless_spy_update(struct net_devi
                         unsigned char *        address,
                         struct iw_quality *    wstats)
  {
                         unsigned char *        address,
                         struct iw_quality *    wstats)
  {
@@ -1108,7 +1098,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
  #ifdef WE_SPY_DEBUG
        printk(KERN_DEBUG "wireless_spy_update() :  offset %ld, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_handlers->spy_offset, spydata, address[0], address[1], address[2], address[3], address[4], address[5]);
  #endif        /* WE_SPY_DEBUG */
  #ifdef WE_SPY_DEBUG
        printk(KERN_DEBUG "wireless_spy_update() :  offset %ld, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_handlers->spy_offset, spydata, address[0], address[1], address[2], address[3], address[4], address[5]);
  #endif        /* WE_SPY_DEBUG */
-@@ -1257,7 +1367,7 @@ void wireless_spy_update(struct net_devi
+@@ -1258,7 +1368,7 @@ void wireless_spy_update(struct net_devi
                               sizeof(struct iw_quality));
                        match = i;
                }
                               sizeof(struct iw_quality));
                        match = i;
                }
@@ -1117,7 +1107,7 @@ Index: linux-2.4.35.4/net/core/wireless.c
        /* Generate an event if we cross the spy threshold.
         * To avoid event storms, we have a simple hysteresis : we generate
         * event only when we go under the low threshold or above the
        /* Generate an event if we cross the spy threshold.
         * To avoid event storms, we have a simple hysteresis : we generate
         * event only when we go under the low threshold or above the
-@@ -1277,6 +1387,4 @@ void wireless_spy_update(struct net_devi
+@@ -1278,6 +1388,4 @@ void wireless_spy_update(struct net_devi
                        }
                }
        }
                        }
                }
        }
Personal OpenWRT clone
This page took 0.03127 seconds and 4 git commands to generate.