nl80211: NAN: Register multicast action frames if possible

The USD passive subscriber and solicited transmission only publisher
require receiving multicast NAN action frames in order to work.
Currently, we are not requesting to receive multicast when
registering NAN action frames. As a result, USD passive subscribe or
solicited only publish may not work.

The NL80211_ATTR_RECEIVE_MULTICAST attribute corresponds to wiphy
ext feature NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS, which
requires driver support and only a few drivers in the kernel tree
support it. Namely ath9k, ath9k_htc, ath10k and hwsim. We should
fall back to register non multicast action frames if the driver
has no support.

It was confirmed that ath9k_htc starts to work after the changes.

Note that even without requesting to receive multicast Action
frames, some drivers would still upload them. For example, rtl8192cu
and hwsim. This is why test cases like test_nan_usd_match would not
fail.

Tested-on: TP-LINK TL-WN821N v3(AR7010+AR9287, ath9k_htc)
Signed-off-by: Chien Wong <m@xv97.com>

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index b84c0a30265bf9501faba24ba63b0610f63b94be..e6fbad96d57fcf3be090b0021ed3c320171ab9d1 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2476,12 +2476,20 @@ static void nl80211_mgmt_handle_register_eloop(struct i802_bss *bss)
 }
 
 
-static int nl80211_register_action_frame(struct i802_bss *bss,
-                                        const u8 *match, size_t match_len)
+static int nl80211_register_action_frame2(struct i802_bss *bss,
+                                         const u8 *match, size_t match_len,
+                                         bool multicast)
 {
        u16 type = (WLAN_FC_TYPE_MGMT << 2) | (WLAN_FC_STYPE_ACTION << 4);
        return nl80211_register_frame(bss, bss->nl_mgmt,
-                                     type, match, match_len, false);
+                                     type, match, match_len, multicast);
+}
+
+
+static int nl80211_register_action_frame(struct i802_bss *bss,
+                                        const u8 *match, size_t match_len)
+{
+       return nl80211_register_action_frame2(bss, match, match_len, false);
 }
 
 
@@ -2557,11 +2565,15 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
                ret = -1;
 #endif /* CONFIG_P2P */
 #ifdef CONFIG_NAN_USD
+#define NAN_PUB_ACTION ((u8 *) "\x04\x09\x50\x6f\x9a\x13")
        /* NAN SDF Public Action */
-       if (nl80211_register_action_frame(bss,
-                                         (u8 *) "\x04\x09\x50\x6f\x9a\x13",
-                                         6) < 0)
-               ret = -1;
+       if (nl80211_register_action_frame2(bss, NAN_PUB_ACTION, 6, true) < 0) {
+               /* fallback to non-multicast */
+               if (nl80211_register_action_frame2(bss, NAN_PUB_ACTION, 6,
+                                                  false) < 0)
+                       ret = -1;
+       }
+#undef NAN_PUB_ACTION
 #endif /* CONFIG_NAN_USD */
 #ifdef CONFIG_DPP
        /* DPP Public Action */