[rdc] sync kernel config

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.24 / 903-hostap_txpower.patch

diff --git a/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
index 6f82cdb..1998787 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
@@ -1,7 +1,6 @@
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c       2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c       2006-12-10 19:13:33.000000000 +0200
-@@ -2345,13 +2345,13 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2358,13 +2358,13 @@
                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)
@@ -21,7 +20,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc
                qual[count].updated = sta->last_rx_updated;
  
                sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2416,13 +2416,13 @@
+@@ -2429,13 +2429,13 @@
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVQUAL;
                if (sta->last_rx_silence == 0)
@@ -41,10 +40,9 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc
                iwe.u.qual.updated = sta->last_rx_updated;
                iwe.len = IW_EV_QUAL_LEN;
                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h   2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h   2006-12-10 19:13:33.000000000 +0200
-@@ -47,4 +47,9 @@
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
   */
  /* #define PRISM2_NO_STATION_MODES */
  
@@ -54,32 +52,29 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-
 +#define RAW_TXPOWER_SETTING
 +
  #endif /* HOSTAP_CONFIG_H */
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h
---- linux-2.6.17/drivers/net/wireless/hostap/hostap.h  2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h  2006-12-10 19:20:00.000000000 +0200
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
 @@ -89,6 +89,7 @@
- extern struct ethtool_ops prism2_ethtool_ops;
+ extern const struct ethtool_ops prism2_ethtool_ops;
  
  int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 +int hostap_restore_power(struct net_device *dev);
  
  
  #endif /* HOSTAP_H */
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c       2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c       2006-12-10 19:13:33.000000000 +0200
-@@ -1043,6 +1043,7 @@
-                      dev->name, local->fragm_threshold);
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -933,6 +933,7 @@
+                       prism2_hw_reset(dev);
        }
  
 +      hostap_restore_power(dev);
        return res;
  }
  
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c     2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c     2006-12-10 19:13:33.000000000 +0200
-@@ -429,6 +429,11 @@
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -433,6 +433,11 @@
        }
  
        /* Get BSSID if we have a valid AP address */
@@ -91,10 +86,9 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-pa
        if (connected) {
                netif_carrier_on(local->dev);
                netif_carrier_on(local->ddev);
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c    2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c    2006-12-10 21:21:03.000000000 +0200
-@@ -1506,23 +1506,20 @@
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1501,23 +1501,20 @@
                val = 255;
  
        tmp = val;
@@ -122,7 +116,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-p
  
        return (unsigned char) tmp;
  }
-@@ -4086,3 +4083,35 @@
+@@ -4077,3 +4074,35 @@
  
        return ret;
  }