Fix compile bug with kernel 2.6.32
authorHauke Mehrtens <hauke@hauke-m.de>
Mon, 12 Oct 2009 21:19:13 +0000 (23:19 +0200)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 13 Oct 2009 19:45:30 +0000 (12:45 -0700)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
compat/patches/12-iw_handler-changes.patch

index 50c9b1a35e0379a1bb87e67e9fe6101020d74f17..7a700b1e20f002cab91d98eee464c6d4c239157e 100644 (file)
@@ -1,11 +1,14 @@
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c   2009-10-08 11:01:52.000000000 -0400
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c   2009-10-08 11:01:43.000000000 -0400
-@@ -6057,7 +6057,7 @@
+@@ -6057,7 +6057,11 @@
  
        dev->ethtool_ops = &ipw2100_ethtool_ops;
        dev->wireless_handlers = &ipw2100_wx_handler_def;
--      priv->wireless_data.libipw = priv->ieee;
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
+       priv->wireless_data.libipw = priv->ieee;
++#else
 +      priv->wireless_data.ieee80211 = (struct ieee80211_device *) priv->ieee;
++#endif
        dev->wireless_data = &priv->wireless_data;
        dev->watchdog_timeo = 3 * HZ;
        dev->irq = 0;