From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Johannes Berg <johannes@sipsolutions.net>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
Avraham Stern <avraham.stern@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: Re: linux-next: build failure after merge of the staging tree
Date: Thu, 4 May 2017 16:41:50 -0700 [thread overview]
Message-ID: <20170504234150.GA13025@kroah.com> (raw)
In-Reply-To: <20170501144218.4f794945@canb.auug.org.au>
On Mon, May 01, 2017 at 02:42:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 'rtw_cfg80211_indicate_connect':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:552:6: error: passing argument 2 of 'cfg80211_roamed' from incompatible pointer type [-Werror=incompatible-pointer-types]
> , notify_channel
> ^
> In file included from drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
> from drivers/staging/rtl8723bs/include/osdep_service.h:23,
> from drivers/staging/rtl8723bs/include/drv_types.h:29,
> from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'struct cfg80211_roam_info *' but argument is of type 'struct ieee80211_channel *'
> void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:553:6: warning: passing argument 3 of 'cfg80211_roamed' makes integer from pointer without a cast [-Wint-conversion]
> , cur_network->network.MacAddress
> ^
> In file included from drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
> from drivers/staging/rtl8723bs/include/osdep_service.h:23,
> from drivers/staging/rtl8723bs/include/drv_types.h:29,
> from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'gfp_t {aka unsigned int}' but argument is of type 'unsigned char *'
> void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:551:3: error: too many arguments to function 'cfg80211_roamed'
> cfg80211_roamed(padapter->pnetdev
> ^
> In file included from drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
> from drivers/staging/rtl8723bs/include/osdep_service.h:23,
> from drivers/staging/rtl8723bs/include/drv_types.h:29,
> from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: declared here
> void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> ^
>
> Caused by commit
>
> 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
>
> interacting with commit
>
> 29ce6ecbb83c ("cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss()")
>
> from the mac80211-next tree.
>
> I applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 1 May 2017 14:34:17 +1000
> Subject: [PATCH] staging: rtl8723bs: fix up for cfg80211_roamed() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f092a72bffda..5e7a61f24f8d 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -542,20 +542,24 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
> struct ieee80211_channel *notify_channel;
> u32 freq;
> u16 channel = cur_network->network.Configuration.DSConfig;
> + struct cfg80211_roam_info roam_info = {};
>
> freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
>
> notify_channel = ieee80211_get_channel(wiphy, freq);
>
> DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
> - cfg80211_roamed(padapter->pnetdev
> - , notify_channel
> - , cur_network->network.MacAddress
> - , pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2
> - , pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2
> - , pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6
> - , pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6
> - , GFP_ATOMIC);
> + roam_info.channel = notify_channel;
> + roam_info.bssid = cur_network->network.MacAddress;
> + roam_info.req_ie =
> + pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2;
> + roam_info.req_ie_len =
> + pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2;
> + roam_info.resp_ie =
> + pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6;
> + roam_info.resp_ie_len =
> + pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6;
> + cfg80211_roamed(padapter->pnetdev, &roam_info, GFP_ATOMIC);
> }
> else
> {
> --
> 2.11.0
>
Thanks for the patch, that's the joy of adding new drivers...
greg k-h
next prev parent reply other threads:[~2017-05-04 23:41 UTC|newest]
Thread overview: 143+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-01 4:42 linux-next: build failure after merge of the staging tree Stephen Rothwell
2017-05-04 23:41 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-08 4:15 Stephen Rothwell
2021-10-08 5:39 ` Sergio Paracuellos
2021-08-16 3:52 Stephen Rothwell
2021-08-16 5:24 ` Greg KH
2021-08-16 15:10 ` Greg KH
2021-08-16 21:46 ` Stephen Rothwell
2021-03-29 5:55 Stephen Rothwell
2021-03-29 6:14 ` Greg KH
2021-03-29 7:25 ` Alexandru Ardelean
2021-04-26 14:41 ` Mark Brown
2021-04-26 16:23 ` Greg KH
2021-04-26 16:40 ` Mark Brown
2021-04-26 1:29 ` Stephen Rothwell
2021-04-26 22:07 ` Stephen Rothwell
2020-12-07 5:46 Stephen Rothwell
2020-12-07 9:26 ` Greg KH
2020-12-07 9:45 ` Stephen Rothwell
2020-12-14 20:27 ` Stephen Rothwell
2019-10-08 2:49 Stephen Rothwell
2019-10-08 12:46 ` Greg KH
2019-06-24 7:38 Stephen Rothwell
2019-06-24 8:46 ` Greg KH
2018-07-30 6:16 Stephen Rothwell
2018-07-30 6:31 ` Gao Xiang
2018-08-01 9:09 ` Chao Yu
2018-08-01 15:07 ` Stephen Rothwell
2018-08-02 6:12 ` Chao Yu
2018-08-02 6:15 ` Greg KH
2018-08-02 7:01 ` Chao Yu
2018-08-02 7:14 ` Greg KH
2018-08-02 7:48 ` Chao Yu
2018-07-30 9:47 ` David Howells
2018-07-30 10:45 ` Gao Xiang
2018-07-30 11:18 ` David Howells
2018-07-30 11:23 ` Gao Xiang
2018-07-17 6:28 Stephen Rothwell
2018-07-17 6:49 ` Ivan Safonov
2018-07-17 8:06 ` Greg KH
2017-09-26 3:54 Stephen Rothwell
2017-09-26 6:15 ` Jonathan Cameron
2017-04-27 4:20 Stephen Rothwell
2017-04-30 12:15 ` Greg KH
2017-04-18 5:53 Stephen Rothwell
2017-04-18 7:04 ` Johannes Berg
2017-04-18 5:32 Stephen Rothwell
2017-04-18 5:54 ` Greg KH
2017-04-18 6:26 ` Stephen Rothwell
2017-04-18 11:16 ` Greg KH
2017-04-11 5:04 Stephen Rothwell
2017-04-11 5:15 ` Greg KH
2017-04-11 5:38 ` Greg KH
2017-04-11 5:48 ` Stephen Rothwell
2017-04-10 5:10 Stephen Rothwell
2017-03-07 1:25 Stephen Rothwell
2017-03-07 4:46 ` Greg KH
2017-03-07 8:47 ` Greg KH
2017-03-07 9:49 ` Stephen Rothwell
2017-03-07 12:24 ` Greg KH
2016-05-13 3:15 Stephen Rothwell
2016-05-13 8:36 ` Greg KH
2015-06-03 7:16 Stephen Rothwell
2015-06-03 7:23 ` Johannes Berg
2015-03-10 5:07 Stephen Rothwell
2015-03-10 15:08 ` Greg KH
2015-03-10 15:53 ` Sudip Mukherjee
2015-03-10 20:57 ` Stephen Rothwell
2014-09-30 8:04 Stephen Rothwell
2014-10-02 16:31 ` Greg KH
2014-08-17 22:47 Stephen Rothwell
2014-06-20 4:18 Stephen Rothwell
2014-06-20 16:53 ` Greg KH
2014-07-10 0:27 ` Stephen Rothwell
2014-07-10 3:09 ` Greg KH
2014-09-22 10:25 ` Geert Uytterhoeven
2014-01-24 2:01 Stephen Rothwell
2014-01-24 2:34 ` Greg KH
2014-01-24 3:53 ` Greg KH
2014-01-24 4:04 ` Stephen Rothwell
2014-01-24 4:08 ` Greg KH
2013-07-26 6:02 Stephen Rothwell
2013-07-26 21:03 ` Greg KH
2013-07-26 21:22 ` Eli Billauer
2013-07-26 21:56 ` Greg KH
2013-07-26 22:54 ` Eli Billauer
2013-07-26 23:28 ` Greg KH
2013-07-27 13:30 ` Eli Billauer
2013-07-25 3:19 Stephen Rothwell
2013-07-25 4:25 ` Greg KH
2013-06-04 4:57 Stephen Rothwell
2013-06-04 5:42 ` Greg KH
2013-06-04 8:55 ` Peng Tao
2013-01-08 2:23 Stephen Rothwell
2013-01-08 4:27 ` Greg KH
2013-01-08 4:29 ` Stephen Rothwell
2013-01-08 16:46 ` H Hartley Sweeten
2012-09-12 6:07 Stephen Rothwell
2012-09-12 16:13 ` Greg KH
2012-09-14 7:55 ` Samuel Ortiz
2012-09-18 20:40 ` Jonathan Cameron
2012-02-17 4:10 Stephen Rothwell
2012-02-17 17:04 ` Greg KH
2012-02-17 17:23 ` Dan Magenheimer
2012-02-16 4:23 Stephen Rothwell
2012-02-16 5:15 ` Greg KH
2012-02-16 14:39 ` Dan Magenheimer
2012-02-16 21:25 ` Stephen Rothwell
2012-02-16 21:49 ` Dan Magenheimer
2012-02-16 23:39 ` Stephen Rothwell
2012-02-17 0:17 ` Greg KH
2012-02-17 16:01 ` Konrad Rzeszutek Wilk
2012-02-10 4:58 Stephen Rothwell
2012-02-10 5:29 ` Greg KH
2012-02-10 17:21 ` Dan Magenheimer
2012-02-10 17:43 ` Greg KH
2012-02-10 18:22 ` Seth Jennings
2012-02-14 23:43 ` Dan Magenheimer
2012-02-15 0:03 ` Greg KH
2012-02-15 0:54 ` Dan Magenheimer
2012-02-15 2:33 ` Greg KH
2012-02-15 16:14 ` Dan Magenheimer
2011-08-25 5:02 Stephen Rothwell
2011-08-25 5:15 ` Larry Finger
2011-08-25 15:39 ` Greg KH
2011-07-25 5:21 Stephen Rothwell
2011-07-16 13:18 Stephen Rothwell
2011-07-17 9:13 ` Greg KH
2011-07-16 13:15 Stephen Rothwell
2011-07-16 23:39 ` Alan Cox
2011-07-17 9:15 ` Greg KH
2011-07-06 5:09 Stephen Rothwell
2011-07-06 15:12 ` Greg KH
2011-07-06 5:02 Stephen Rothwell
2011-07-06 15:12 ` Greg KH
2010-04-27 4:12 Stephen Rothwell
2010-04-27 15:13 ` Greg KH
2010-04-28 6:14 ` Stephen Rothwell
2010-04-28 15:28 ` Greg KH
2010-05-01 15:42 ` Tobias Klauser
2010-05-03 16:17 ` Tobias Klauser
2010-05-05 2:37 ` Stephen Rothwell
2010-05-05 8:39 ` Tobias Klauser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170504234150.GA13025@kroah.com \
--to=greg@kroah.com \
--cc=avraham.stern@intel.com \
--cc=hdegoede@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).