KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

acx-mac80211: make it compile with recent mac80211 again

Browse source 
SVN-Revision: 36481
This commit is contained in:
Hauke Mehrtens 2013-04-28 18:53:20 +00:00
parent 7dee0dae35
commit 8a3a7fdf07
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/acx-mac80211/Makefile
View file

@ -187,7 +187,7 @@ define Build/Compile
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
SUBDIRS="$(PKG_BUILD_DIR)" \ SUBDIRS="$(PKG_BUILD_DIR)" \
$(PKG_EXTRA_KCONFIG) \ $(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 \ 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 -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
-I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \ -I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \

27
package/acx-mac80211/patches/003-add-changes-for-3-10.patch Normal file
View file

@ -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)