From: Hauke Mehrtens Date: Mon, 12 Oct 2009 21:19:13 +0000 (+0200) Subject: Fix compile bug with kernel 2.6.32 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=34e4c4ec66a75b2478d27f403cebbcbb769a005e;p=openwrt%2Fstaging%2Fblogic.git Fix compile bug with kernel 2.6.32 Signed-off-by: Hauke Mehrtens --- diff --git a/compat/patches/12-iw_handler-changes.patch b/compat/patches/12-iw_handler-changes.patch index 50c9b1a35e03..7a700b1e20f0 100644 --- a/compat/patches/12-iw_handler-changes.patch +++ b/compat/patches/12-iw_handler-changes.patch @@ -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;