The two patches
mac80211: share sta->supp_rates
and
mac80211: share STA information with driver
caused a build failure in some debugging code, this fixes it.
Thanks to Davide Pesavento for bringing the issue to my attention.
Signed-off-by: Johannes Berg <[email protected]>
Cc: Davide Pesavento <[email protected]>
---
net/mac80211/mlme.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- everything.orig/net/mac80211/mlme.c 2008-09-11 23:20:53.000000000 +0200
+++ everything/net/mac80211/mlme.c 2008-09-11 23:21:11.000000000 +0200
@@ -1534,14 +1534,15 @@ static void ieee80211_rx_bss_info(struct
ieee80211_mandatory_rates(local, band);
#ifdef CONFIG_MAC80211_IBSS_DEBUG
- if (sta->supp_rates[band] != prev_rates)
+ if (sta->sta.supp_rates[band] != prev_rates)
printk(KERN_DEBUG "%s: updated supp_rates set "
"for %s based on beacon info (0x%llx | "
"0x%llx -> 0x%llx)\n",
- sdata->dev->name, print_mac(mac, sta->addr),
+ sdata->dev->name,
+ print_mac(mac, sta->sta.addr),
(unsigned long long) prev_rates,
(unsigned long long) supp_rates,
- (unsigned long long) sta->supp_rates[band]);
+ (unsigned long long) sta->sta.supp_rates[band]);
#endif
} else {
ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid,
On Thu, 2008-09-11 at 23:36 +0200, Davide Pesavento wrote:
> Thank you, this patch fixes the build failure I reported, but there's
> another one... :P
All these weird configurations ;)
johannes
2008/9/11 Johannes Berg <[email protected]>:
> The two patches
> mac80211: share sta->supp_rates
> and
> mac80211: share STA information with driver
>
> caused a build failure in some debugging code, this fixes it.
> Thanks to Davide Pesavento for bringing the issue to my attention.
>
> Signed-off-by: Johannes Berg <[email protected]>
> Cc: Davide Pesavento <[email protected]>
> ---
> net/mac80211/mlme.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> --- everything.orig/net/mac80211/mlme.c 2008-09-11 23:20:53.000000000 +0200
> +++ everything/net/mac80211/mlme.c 2008-09-11 23:21:11.000000000 +0200
> @@ -1534,14 +1534,15 @@ static void ieee80211_rx_bss_info(struct
> ieee80211_mandatory_rates(local, band);
>
> #ifdef CONFIG_MAC80211_IBSS_DEBUG
> - if (sta->supp_rates[band] != prev_rates)
> + if (sta->sta.supp_rates[band] != prev_rates)
> printk(KERN_DEBUG "%s: updated supp_rates set "
> "for %s based on beacon info (0x%llx | "
> "0x%llx -> 0x%llx)\n",
> - sdata->dev->name, print_mac(mac, sta->addr),
> + sdata->dev->name,
> + print_mac(mac, sta->sta.addr),
> (unsigned long long) prev_rates,
> (unsigned long long) supp_rates,
> - (unsigned long long) sta->supp_rates[band]);
> + (unsigned long long) sta->sta.supp_rates[band]);
> #endif
> } else {
> ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid,
>
>
>
Thank you, this patch fixes the build failure I reported, but there's
another one... :P
CC [M] net/mac80211/tx.o
net/mac80211/tx.c: In function 'ieee80211_beacon_get':
net/mac80211/tx.c:1906: error: 'union <anonymous>' has no member named 'mesh'
make[2]: *** [net/mac80211/tx.o] Error 1
make[1]: *** [net/mac80211] Error 2
make: *** [net] Error 2