Hi Kalle, Below is the second patch in the series; Kindly help to merge both;
Regards, Ganapathi > -----Original Message----- > From: Ganapathi Bhat <[email protected]> > Sent: Thursday, May 30, 2019 3:23 PM > To: [email protected] > Cc: Cathy Luo <[email protected]>; Zhiyuan Yang <[email protected]>; > James Cao <[email protected]>; Rakesh Parmar <[email protected]>; > Sharvari Harisangam <[email protected]>; Ganapathi Bhat > <[email protected]> > Subject: [PATCH 2/2] mwifiex: add support for WIPHY_WOWLAN_ANY > > From: Sharvari Harisangam <[email protected]> > > Advertise support for WIPHY_WOWLAN_ANY trigger. Update default > hostsleep condition to handle magic packet. > > Signed-off-by: Sharvari Harisangam <[email protected]> > Signed-off-by: Ganapathi Bhat <[email protected]> > --- > drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +++--- > drivers/net/wireless/marvell/mwifiex/fw.h | 4 +++- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c > b/drivers/net/wireless/marvell/mwifiex/cfg80211.c > index e11a4bb..f23bb9c 100644 > --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c > +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c > @@ -3492,7 +3492,7 @@ static int mwifiex_cfg80211_suspend(struct wiphy > *wiphy, > wowlan->nd_config); > } > > - if (wowlan->disconnect) { > + if (wowlan->disconnect || wowlan->any || wowlan->magic_pkt) { > hs_cfg.conditions |= HS_CFG_COND_MAC_EVENT; > mwifiex_dbg(sta_priv->adapter, INFO, "Wake on device > disconnect\n"); > } > @@ -4232,7 +4232,7 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, > struct wireless_dev *wdev, static const struct wiphy_wowlan_support > mwifiex_wowlan_support = { > .flags = WIPHY_WOWLAN_MAGIC_PKT | > WIPHY_WOWLAN_DISCONNECT | > WIPHY_WOWLAN_NET_DETECT | > WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | > - WIPHY_WOWLAN_GTK_REKEY_FAILURE, > + WIPHY_WOWLAN_GTK_REKEY_FAILURE | > WIPHY_WOWLAN_ANY, > .n_patterns = MWIFIEX_MEF_MAX_FILTERS, > .pattern_min_len = 1, > .pattern_max_len = MWIFIEX_MAX_PATTERN_LEN, @@ -4242,7 > +4242,7 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct > wireless_dev *wdev, > > static const struct wiphy_wowlan_support > mwifiex_wowlan_support_no_gtk = { > .flags = WIPHY_WOWLAN_MAGIC_PKT | > WIPHY_WOWLAN_DISCONNECT | > - WIPHY_WOWLAN_NET_DETECT, > + WIPHY_WOWLAN_NET_DETECT | WIPHY_WOWLAN_ANY, > .n_patterns = MWIFIEX_MEF_MAX_FILTERS, > .pattern_min_len = 1, > .pattern_max_len = MWIFIEX_MAX_PATTERN_LEN, diff --git > a/drivers/net/wireless/marvell/mwifiex/fw.h > b/drivers/net/wireless/marvell/mwifiex/fw.h > index b73f99d..ad34b25 100644 > --- a/drivers/net/wireless/marvell/mwifiex/fw.h > +++ b/drivers/net/wireless/marvell/mwifiex/fw.h > @@ -478,7 +478,9 @@ enum mwifiex_channel_flags { > #define HostCmd_SCAN_RADIO_TYPE_A 1 > > #define HS_CFG_CANCEL 0xffffffff > -#define HS_CFG_COND_DEF 0x00000000 > +#define HS_CFG_COND_DEF (HS_CFG_COND_BROADCAST_DATA > |\ > + HS_CFG_COND_UNICAST_DATA |\ > + HS_CFG_COND_MULTICAST_DATA) > #define HS_CFG_GPIO_DEF 0xff > #define HS_CFG_GAP_DEF 0xff > #define HS_CFG_COND_BROADCAST_DATA 0x00000001 > -- > 1.9.1
