Hi all,
After merging the mac80211-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/staging/wilc1000/cfg80211.c:1668:3: error: 'const struct cfg80211_ops' has no member named 'mgmt_frame_register'
1668 | .mgmt_frame_register = wilc_mgmt_frame_register,
| ^~~~~~~~~~~~~~~~~~~
drivers/staging/wilc1000/cfg80211.c:1668:25: error: initialization of 'int (*)(struct wiphy *, struct wireless_dev *, u64)' {aka 'int (*)(struct wiphy *, struct wireless_dev *, long long unsigned int)'} from incompatible pointer type 'void (*)(struct wiphy *, struct wireless_dev *, u16, bool)' {aka 'void (*)(struct wiphy *, struct wireless_dev *, short unsigned int, _Bool)'} [-Werror=incompatible-pointer-types]
1668 | .mgmt_frame_register = wilc_mgmt_frame_register,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/wilc1000/cfg80211.c:1668:25: note: (near initialization for 'wilc_cfg80211_ops.mgmt_tx_cancel_wait')
cc1: some warnings being treated as errors
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3400:3: error: 'struct cfg80211_ops' has no member named 'mgmt_frame_register'
3400 | .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
| ^~~~~~~~~~~~~~~~~~~
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3400:25: error: initialization of 'int (*)(struct wiphy *, struct wireless_dev *, u64)' {aka 'int (*)(struct wiphy *, struct wireless_dev *, long long unsigned int)'} from incompatible pointer type 'void (*)(struct wiphy *, struct wireless_dev *, u16, bool)' {aka 'void (*)(struct wiphy *, struct wireless_dev *, short unsigned int, _Bool)'} [-Werror=incompatible-pointer-types]
3400 | .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3400:25: note: (near initialization for 'rtw_cfg80211_ops.mgmt_tx_cancel_wait')
Caused by commit
6cd536fe62ef ("cfg80211: change internal management frame registration API")
I have used the mac80211-next from next-20200424 for today.
--
Cheers,
Stephen Rothwell
On Tue, 2020-04-28 at 12:29 +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mac80211-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> Caused by commit
>
> 6cd536fe62ef ("cfg80211: change internal management frame registration API")
Yeah. I forgot about staging. I guess I'll throw in a quick fix.
johannes
On Tue, Apr 28, 2020 at 09:01:30AM +0200, Johannes Berg wrote:
> On Tue, 2020-04-28 at 12:29 +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the mac80211-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > Caused by commit
> >
> > 6cd536fe62ef ("cfg80211: change internal management frame registration API")
>
> Yeah. I forgot about staging. I guess I'll throw in a quick fix.
>
> johannes
Hello Johannes,
Could you please take a look at the following fix for this issue:
https://patchwork.kernel.org/patch/11509497/
Regards,
Sergey
> > Looks good. But I have a couple of questions:
> >
> > - why cleanup vif->mgmt_frame_reg in wilc_mac_open ?
>
> Otherwise wilc_update_mgmt_frame_registrations() will think there are no
> changes whatsoever, and do nothing.
>
> > - previously wilc_wfi_p2p_rx was called only for PROBE_REQ and ACTION,
> > now it will be called for all the other registred frames as well
>
>
> Huh, good catch. How about this?
>
> https://p.sipsolutions.net/51183f5492f05ea6.txt
Ok, this one looks good to me.
Regards,
Sergey