acx-mac80211: make it compile with recent mac80211 again

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36481 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index 35f7e39..30c375e 100644 (file)
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -187,7 +187,7 @@ define Build/Compile
                CROSS_COMPILE="$(TARGET_CROSS)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \
                $(PKG_EXTRA_KCONFIG) \
-               EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,8,0)\"" \
+               EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,10,0)\"" \
                LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
                        -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
                        -I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \

diff --git a/package/acx-mac80211/patches/003-add-changes-for-3-10.patch b/package/acx-mac80211/patches/003-add-changes-for-3-10.patch
new file mode 100644 (file)
index 0000000..18d4f9e
--- /dev/null
+++ b/package/acx-mac80211/patches/003-add-changes-for-3-10.patch
@@ -0,0 +1,27 @@
+--- a/main.c
++++ b/main.c
+@@ -681,6 +681,7 @@ int acx_op_config(struct ieee80211_hw *h
+       if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+               changed_not_done &= ~IEEE80211_CONF_CHANGE_CHANNEL;
+ 
++#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 10, 0)
+               logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL, "
+                       "channel->hw_value=%i\n", conf->channel->hw_value);
+ 
+@@ -689,6 +690,16 @@ int acx_op_config(struct ieee80211_hw *h
+ 
+               acx_selectchannel(adev, conf->channel->hw_value,
+                               conf->channel->center_freq);
++#else
++              logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL, "
++                      "channel->hw_value=%i\n", conf->chandef.chan->hw_value);
++
++              if (conf->chandef.chan->hw_value == adev->channel)
++                      goto change_channel_done;
++
++              acx_selectchannel(adev, conf->chandef.chan->hw_value,
++                              conf->chandef.chan->center_freq);
++#endif
+       }
+ change_channel_done:
+       if (changed_not_done)