Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259535
b: refs/heads/master
c: 9996059
h: refs/heads/master
i:
  259533: abcea1d
  259531: 596ca14
  259527: 1f7cb56
  259519: c2c38a8
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent f4d45af commit 186bd6b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73d924bfe384af21b67f25698bde925f9b02e795
refs/heads/master: 9996059d8bab60635ab662c23d85222af5402ced
5 changes: 3 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 186bd6b

Please sign in to comment.