[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.git] / package / madwifi / patches / 409-wext_compat.patch

diff --git a/package/madwifi/patches/409-wext_compat.patch b/package/madwifi/patches/409-wext_compat.patch
index 4d5ebae..4497092 100644 (file)
--- a/package/madwifi/patches/409-wext_compat.patch
+++ b/package/madwifi/patches/409-wext_compat.patch
@@ -14,7 +14,7 @@
  static void
  pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt);
  
-@@ -1800,7 +1807,7 @@
+@@ -1800,7 +1807,7 @@ giwscan_cb(void *arg, const struct ieee8
                IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_macaddr);
        else
                IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid);
@@ -23,7 +23,7 @@
  
        /* We ran out of space in the buffer. */
        if (last_ev == current_ev)
-@@ -1811,7 +1818,7 @@
+@@ -1811,7 +1818,7 @@ giwscan_cb(void *arg, const struct ieee8
        iwe.cmd = SIOCGIWESSID;
        iwe.u.data.flags = 1;
        iwe.u.data.length = se->se_ssid[1];
@@ -32,7 +32,7 @@
                end_buf, &iwe, (char *) se->se_ssid+2);
  
        /* We ran out of space in the buffer. */
-@@ -1824,7 +1831,7 @@
+@@ -1824,7 +1831,7 @@ giwscan_cb(void *arg, const struct ieee8
                iwe.cmd = SIOCGIWMODE;
                iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ?
                        IW_MODE_MASTER : IW_MODE_ADHOC;
@@ -41,7 +41,7 @@
                        end_buf, &iwe, IW_EV_UINT_LEN);
  
                /* We ran out of space in the buffer. */
-@@ -1837,7 +1844,7 @@
+@@ -1837,7 +1844,7 @@ giwscan_cb(void *arg, const struct ieee8
        iwe.cmd = SIOCGIWFREQ;
        iwe.u.freq.m = se->se_chan->ic_freq * 100000;
        iwe.u.freq.e = 1;
@@ -50,7 +50,7 @@
                end_buf, &iwe, IW_EV_FREQ_LEN);
  
        /* We ran out of space in the buffer. */
-@@ -1848,7 +1855,7 @@
+@@ -1848,7 +1855,7 @@ giwscan_cb(void *arg, const struct ieee8
        last_ev = current_ev;
        iwe.cmd = IWEVQUAL;
        set_quality(&iwe.u.qual, se->se_rssi, ATH_DEFAULT_NOISE);
@@ -59,7 +59,7 @@
                end_buf, &iwe, IW_EV_QUAL_LEN);
  
        /* We ran out of space in the buffer */
-@@ -1863,7 +1870,7 @@
+@@ -1863,7 +1870,7 @@ giwscan_cb(void *arg, const struct ieee8
        else
                iwe.u.data.flags = IW_ENCODE_DISABLED;
        iwe.u.data.length = 0;
@@ -68,7 +68,7 @@
  
        /* We ran out of space in the buffer. */
        if (last_ev == current_ev)
-@@ -1878,7 +1885,7 @@
+@@ -1878,7 +1885,7 @@ giwscan_cb(void *arg, const struct ieee8
                int r = se->se_rates[2 + j] & IEEE80211_RATE_VAL;
                if (r != 0) {
                        iwe.u.bitrate.value = r * (1000000 / 2);
@@ -77,7 +77,7 @@
                                current_val, end_buf, &iwe,
                                IW_EV_PARAM_LEN);
                }
-@@ -1887,7 +1894,7 @@
+@@ -1887,7 +1894,7 @@ giwscan_cb(void *arg, const struct ieee8
                int r = se->se_xrates[2+j] & IEEE80211_RATE_VAL;
                if (r != 0) {
                        iwe.u.bitrate.value = r * (1000000 / 2);
@@ -86,7 +86,7 @@
                                current_val, end_buf, &iwe,
                                IW_EV_PARAM_LEN);
                }
-@@ -1906,7 +1913,7 @@
+@@ -1906,7 +1913,7 @@ giwscan_cb(void *arg, const struct ieee8
        iwe.cmd = IWEVCUSTOM;
        snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval);
        iwe.u.data.length = strlen(buf);
@@ -95,7 +95,7 @@
  
        /* We ran out of space in the buffer. */
        if (last_ev == current_ev)
-@@ -1930,7 +1937,7 @@
+@@ -1930,7 +1937,7 @@ giwscan_cb(void *arg, const struct ieee8
                                rsn_leader, sizeof(rsn_leader) - 1);
  #endif
                if (iwe.u.data.length != 0) {
@@ -104,7 +104,7 @@
                                &iwe, buf);
  
                        /* We ran out of space in the buffer */
-@@ -1956,7 +1963,7 @@
+@@ -1956,7 +1963,7 @@ giwscan_cb(void *arg, const struct ieee8
                        wpa_leader, sizeof(wpa_leader) - 1);
  #endif
                if (iwe.u.data.length != 0) {
@@ -113,7 +113,7 @@
                                &iwe, buf);
  
                        /* We ran out of space in the buffer. */
-@@ -1975,7 +1982,7 @@
+@@ -1975,7 +1982,7 @@ giwscan_cb(void *arg, const struct ieee8
                        se->se_wme_ie, se->se_wme_ie[1] + 2,
                        wme_leader, sizeof(wme_leader) - 1);
                if (iwe.u.data.length != 0) {
@@ -122,7 +122,7 @@
                                &iwe, buf);
  
                        /* We ran out of space in the buffer. */
-@@ -1993,7 +2000,7 @@
+@@ -1993,7 +2000,7 @@ giwscan_cb(void *arg, const struct ieee8
                        se->se_ath_ie, se->se_ath_ie[1] + 2,
                        ath_leader, sizeof(ath_leader) - 1);
                if (iwe.u.data.length != 0) {