From patchwork Thu Jun 9 14:45:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 865762 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p59Ek1HO010312 for ; Thu, 9 Jun 2011 14:46:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770Ab1FIOpw (ORCPT ); Thu, 9 Jun 2011 10:45:52 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:4696 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752676Ab1FIOpT (ORCPT ); Thu, 9 Jun 2011 10:45:19 -0400 Received: from [10.9.200.133] by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 09 Jun 2011 07:49:07 -0700 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Thu, 9 Jun 2011 07:44:58 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id F316874D16; Thu, 9 Jun 2011 07:45:06 -0700 (PDT) Received: from rvossenubuntu (unknown [10.176.68.21]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 8336E20509; Thu, 9 Jun 2011 07:45:06 -0700 (PDT) Received: from rvossen by rvossenubuntu with local (Exim 4.74) ( envelope-from ) id 1QUgTp-0002Pn-83; Thu, 09 Jun 2011 16:45:05 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 21/21] staging: brcm80211: change wl_cfg80211_suspend corresponding to cfg80211 Date: Thu, 9 Jun 2011 16:45:01 +0200 Message-ID: <1307630701-9170-22-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307630701-9170-1-git-send-email-rvossen@broadcom.com> References: <1307630701-9170-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 61EE02E94NS18385287-01-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Jun 2011 14:46:02 +0000 (UTC) Change wl_cfg80211_suspend in fullmac to meet cfg80211 interface update. Signed-off-by: Franky Lin Reviewed-by: Roland Vossen --- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 235cc59..63e2173 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -101,7 +101,8 @@ static s32 wl_cfg80211_config_default_mgmt_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx); static s32 wl_cfg80211_resume(struct wiphy *wiphy); -static s32 wl_cfg80211_suspend(struct wiphy *wiphy); +static s32 wl_cfg80211_suspend(struct wiphy *wiphy, + struct cfg80211_wowlan *wow); static s32 wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_pmksa *pmksa); static s32 wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, @@ -2092,7 +2093,7 @@ static s32 wl_cfg80211_resume(struct wiphy *wiphy) return 0; } -static s32 wl_cfg80211_suspend(struct wiphy *wiphy) +static s32 wl_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) { struct wl_priv *wl = wiphy_to_wl(wiphy); struct net_device *ndev = wl_to_ndev(wl);