Fix net/mac80211/iface.c compat patch to account for wext removal stuff

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat-2.6.32.h b/compat/compat-2.6.32.h
index 53fea8337df951f17b6af16f9a14ce04dc6ef936..931fac2136a488823675a6a9d3762f55c631df73 100644 (file)
--- a/compat/compat-2.6.32.h
+++ b/compat/compat-2.6.32.h
@@ -7,6 +7,13 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32))
 
+#define SDIO_VENDOR_ID_INTEL                   0x0089
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX     0x1402
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI      0x1403
+#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP       0x1404
+#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS       0x1405
+#define SDIO_DEVICE_ID_INTEL_IWMC3200BT                0x1406
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) */
 
 #endif /* LINUX_26_32_COMPAT_H */

diff --git a/compat/compat.diff b/compat/compat.diff
index 2cf44c08b3ef9f7ecea0afc9f75e56854f373702..cebb1c49d86a80eb9842236d7e7b42156e955549 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -542,9 +542,9 @@
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
  #include <trace/define_trace.h>
 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */
---- a/net/mac80211/iface.c     2009-07-27 07:58:11.781079971 -0700
-+++ b/net/mac80211/iface.c     2009-07-27 07:58:14.042068740 -0700
-@@ -660,6 +660,7 @@
+--- a/net/mac80211/iface.c     2009-07-27 13:03:30.589047026 -0700
++++ b/net/mac80211/iface.c     2009-07-27 14:39:46.521397084 -0700
+@@ -660,6 +660,7 @@ static void ieee80211_teardown_sdata(str
        WARN_ON(flushed);
  }
  
@@ -552,7 +552,7 @@
  static const struct net_device_ops ieee80211_dataif_ops = {
        .ndo_open               = ieee80211_open,
        .ndo_stop               = ieee80211_stop,
-@@ -679,11 +680,22 @@
+@@ -679,11 +680,22 @@ static const struct net_device_ops ieee8
        .ndo_change_mtu         = ieee80211_change_mtu,
        .ndo_set_mac_address    = eth_mac_addr,
  };
@@ -572,10 +572,10 @@
 +      /* we will validate the address ourselves in ->open */
 +      dev->validate_addr = NULL;
 +#endif
-       dev->wireless_handlers = &ieee80211_iw_handler_def;
        dev->destructor = free_netdev;
  }
-@@ -699,7 +711,11 @@
+ 
+@@ -698,7 +710,11 @@ static void ieee80211_setup_sdata(struct
  
        /* and set some type-dependent values */
        sdata->vif.type = type;
@@ -587,7 +587,7 @@
        sdata->wdev.iftype = type;
  
        /* only monitor differs */
-@@ -722,7 +738,11 @@
+@@ -721,7 +737,11 @@ static void ieee80211_setup_sdata(struct
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -599,7 +599,7 @@
                sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
                                      MONITOR_FLAG_OTHER_BSS;
                break;
-@@ -789,6 +809,8 @@
+@@ -788,6 +808,8 @@ int ieee80211_if_add(struct ieee80211_lo
                return -ENOMEM;
        dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -608,7 +608,7 @@
        ndev->needed_headroom = local->tx_headroom +
                                4*6 /* four MAC addresses */
                                + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -797,6 +819,7 @@
+@@ -796,6 +818,7 @@ int ieee80211_if_add(struct ieee80211_lo
                                - ETH_HLEN /* ethernet hard_header_len */
                                + IEEE80211_ENCRYPT_HEADROOM;
        ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -616,7 +616,7 @@
  
        ret = dev_alloc_name(ndev, ndev->name);
        if (ret < 0)
-@@ -829,6 +852,10 @@
+@@ -828,6 +851,10 @@ int ieee80211_if_add(struct ieee80211_lo
        if (ret)
                goto fail;