From: Greg KH <gregkh@linuxfoundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org
Subject: [PATCH 1/3] staging: rtl8723bs: merge fix for add/change_virtual-intf API change
Date: Fri, 5 May 2017 14:57:36 -0700 [thread overview]
Message-ID: <20170505215736.GB19258@kroah.com> (raw)
In-Reply-To: <20170505215630.GA19258@kroah.com>
From: Stephen Rothwell <sfr@canb.auug.org.au>
This fixes the add/change_virtual-intf API change that happened in the
wifi tree in the rtl8723bs driver.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 3b7573959312..e4fdda3c4591 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1310,7 +1310,7 @@ extern int netdev_open(struct net_device *pnetdev);
static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
struct net_device *ndev,
- enum nl80211_iftype type, u32 *flags,
+ enum nl80211_iftype type,
struct vif_params *params)
{
enum nl80211_iftype old_type;
@@ -2711,7 +2711,7 @@ static struct wireless_dev *
struct wiphy *wiphy,
const char *name,
unsigned char name_assign_type,
- enum nl80211_iftype type, u32 *flags, struct vif_params *params)
+ enum nl80211_iftype type, struct vif_params *params)
{
int ret = 0;
struct net_device* ndev = NULL;
--
2.12.2
next prev parent reply other threads:[~2017-05-05 21:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-05 21:56 [GIT PULL] Staging/IIO driver fixes for 4.12-rc1 Greg KH
2017-05-05 21:57 ` Greg KH [this message]
2017-05-05 21:58 ` [PATCH 2/3] staging: rtl8723bs: merge fix for "nl80211: allow multiple active scheduled scan requests" Greg KH
2017-05-05 21:59 ` [PATCH 3/3] staging: rtl8723bs: fix up for cfg80211_roamed() API change Greg KH
2017-05-06 20:33 ` kbuild test robot
2017-05-06 20:28 ` [PATCH 2/3] staging: rtl8723bs: merge fix for "nl80211: allow multiple active scheduled scan requests" kbuild test robot
2017-05-06 8:00 ` [GIT PULL] Staging/IIO driver fixes for 4.12-rc1 Ian W MORRISON
2017-05-06 13:41 ` Greg KH
2017-05-06 14:21 ` Ian W MORRISON
2017-05-06 14:46 ` Greg KH
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=20170505215736.GB19258@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=devel@linuxdriverproject.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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).