Messages in this thread Patch in this message | | | Date | Wed, 12 Oct 2011 13:36:00 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the wireless tree |
| |
Hi John,
After merging the wireless tree, today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:1131:2: error: unknown field 'ndo_set_multicast_list' specified in initializer drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:1132:1: warning: initialization from incompatible pointer type [enabled by default] drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:1132:1: warning: (near initialization for 'brcmf_netdev_ops_pri.ndo_validate_addr') [enabled by default]
Caused by commit 5b435de0d786 ("net: wireless: add brcm80211 drivers") interacting with commit b81693d9149c ("net: remove ndo_set_multicast_list callback") from the net-next tree.
I have applied the following merge fixup patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 12 Oct 2011 13:33:10 +1100 Subject: [PATCH] net: wireless: brcm80211: replace ndo_set_multicast_list with ndo_set_rx_mode
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 99ba5e3..03607ca 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -1128,7 +1128,7 @@ static struct net_device_ops brcmf_netdev_ops_pri = { .ndo_do_ioctl = brcmf_netdev_ioctl_entry, .ndo_start_xmit = brcmf_netdev_start_xmit, .ndo_set_mac_address = brcmf_netdev_set_mac_address, - .ndo_set_multicast_list = brcmf_netdev_set_multicast_list + .ndo_set_rx_mode = brcmf_netdev_set_multicast_list }; int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx) -- 1.7.6.3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |