From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755682AbdEEV6Y (ORCPT ); Fri, 5 May 2017 17:58:24 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:53350 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752798AbdEEV5p (ORCPT ); Fri, 5 May 2017 17:57:45 -0400 Date: Fri, 5 May 2017 14:57:36 -0700 From: Greg KH To: Linus Torvalds , Andrew Morton , Stephen Rothwell Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org Subject: [PATCH 1/3] staging: rtl8723bs: merge fix for add/change_virtual-intf API change Message-ID: <20170505215736.GB19258@kroah.com> References: <20170505215630.GA19258@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170505215630.GA19258@kroah.com> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell This fixes the add/change_virtual-intf API change that happened in the wifi tree in the rtl8723bs driver. Signed-off-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman --- 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