acx-mac80211: make it compile with recent mac80211 again
[openwrt/openwrt.git] / package / acx-mac80211 / patches / 003-add-changes-for-3-10.patch
1 --- a/main.c
2 +++ b/main.c
3 @@ -681,6 +681,7 @@ int acx_op_config(struct ieee80211_hw *h
4 if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
5 changed_not_done &= ~IEEE80211_CONF_CHANGE_CHANNEL;
6
7 +#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 10, 0)
8 logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL, "
9 "channel->hw_value=%i\n", conf->channel->hw_value);
10
11 @@ -689,6 +690,16 @@ int acx_op_config(struct ieee80211_hw *h
12
13 acx_selectchannel(adev, conf->channel->hw_value,
14 conf->channel->center_freq);
15 +#else
16 + logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL, "
17 + "channel->hw_value=%i\n", conf->chandef.chan->hw_value);
18 +
19 + if (conf->chandef.chan->hw_value == adev->channel)
20 + goto change_channel_done;
21 +
22 + acx_selectchannel(adev, conf->chandef.chan->hw_value,
23 + conf->chandef.chan->center_freq);
24 +#endif
25 }
26 change_channel_done:
27 if (changed_not_done)