Helmut,
sorry, my mistake. You can ignore my previous e-mail, the patch applies cleanly.
Many thanks.
Regards,
David.
2008/7/28 David Planella <david.planella@...>:
> Hi Helmut,
>
> many thanks for your patch.
>
> I have tried it against the current head of the wireless-new branch,
> but it does not apply.
>
> Could you please try to update your local copy of the wireless-new
> branch to the latest version from the acx repo, create a new patch and
> send it back to the list?
>
> Regards,
> David.
>
> 2008/7/28 Helmut Schaa <hschaa@...>:
>> Fix build of branch wireless-new against current mac80211 (wireless-testing).
>>
>> Signed-off-by: Helmut Schaa <hschaa@...>
>> ---
>>
>> diff --git a/common.c b/common.c
>> index 7910b69..f773b4b 100644
>> --- a/common.c
>> +++ b/common.c
>> @@ -4382,7 +4382,7 @@ extern int acx_config_interface(struct ieee80211_hw* ieee,
>>
>> acx_lock(adev, flags);
>>
>> - if ((conf->type != IEEE80211_IF_TYPE_MNTR)
>> + if ((vif->type != IEEE80211_IF_TYPE_MNTR)
>> && (adev->vif == vif)) {
>> if (conf->bssid)
>> {
>> @@ -4390,7 +4390,7 @@ extern int acx_config_interface(struct ieee80211_hw* ieee,
>> MAC_COPY(adev->bssid,conf->bssid);
>> }
>> }
>> - if ((conf->type == IEEE80211_IF_TYPE_AP)
>> + if ((vif->type == IEEE80211_IF_TYPE_AP)
>> && (adev->vif == vif)) {
>> if ((conf->ssid_len > 0) && conf->ssid)
>> {
>> @@ -4399,10 +4399,10 @@ extern int acx_config_interface(struct ieee80211_hw* ieee,
>> SET_BIT(adev->set_mask, SET_TEMPLATES);
>> }
>> }
>> - if (conf->beacon != 0)
>> + if (conf->changed & IEEE80211_IFCC_BEACON)
>> {
>> adev->beacon_interval = DEFAULT_BEACON_INTERVAL;
>> - adev->beacon_cache = conf->beacon;
>> + adev->beacon_cache = ieee80211_beacon_get(ieee, vif);
>> SET_BIT(adev->set_mask, SET_TEMPLATES);
>> }
>>
>>
>
|