* [PATCH 0/2] cfg80211/mac80211 patches from our internal tree 2017-12-18
@ 2017-12-18 10:14 Luca Coelho
2017-12-18 10:14 ` [PATCH 1/2] mac80211_hwsim: enable TODS BIT in null data frame Luca Coelho
2017-12-18 10:14 ` [PATCH 2/2] nl80211: send deauth reason if locally generated Luca Coelho
0 siblings, 2 replies; 3+ messages in thread
From: Luca Coelho @ 2017-12-18 10:14 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, Luca Coelho
From: Luca Coelho <luciano.coelho@intel.com>
Hi,
Here are a couple of patches from our internal tree.
Cheers,
Luca.
Adiel Aloni (1):
mac80211_hwsim: enable TODS BIT in null data frame
David Spinadel (1):
nl80211: send deauth reason if locally generated
drivers/net/wireless/mac80211_hwsim.c | 1 +
net/wireless/nl80211.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
2.15.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] mac80211_hwsim: enable TODS BIT in null data frame
2017-12-18 10:14 [PATCH 0/2] cfg80211/mac80211 patches from our internal tree 2017-12-18 Luca Coelho
@ 2017-12-18 10:14 ` Luca Coelho
2017-12-18 10:14 ` [PATCH 2/2] nl80211: send deauth reason if locally generated Luca Coelho
1 sibling, 0 replies; 3+ messages in thread
From: Luca Coelho @ 2017-12-18 10:14 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, Adiel Aloni, Luca Coelho
From: Adiel Aloni <adiel.aloni@intel.com>
Same as in ieee80211_nullfunc_get, enable the TODS bit, otherwise the
nullfunc packet will not be handled in ap rx path.
(will be dropped in ieee80211_accept_frame()).
Signed-off-by: Adiel Aloni <adiel.aloni@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/mac80211_hwsim.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 45cca54c05bf..3141b8e28b34 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -684,6 +684,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
hdr = skb_put(skb, sizeof(*hdr) - ETH_ALEN);
hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |
IEEE80211_STYPE_NULLFUNC |
+ IEEE80211_FCTL_TODS |
(ps ? IEEE80211_FCTL_PM : 0));
hdr->duration_id = cpu_to_le16(0);
memcpy(hdr->addr1, vp->bssid, ETH_ALEN);
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] nl80211: send deauth reason if locally generated
2017-12-18 10:14 [PATCH 0/2] cfg80211/mac80211 patches from our internal tree 2017-12-18 Luca Coelho
2017-12-18 10:14 ` [PATCH 1/2] mac80211_hwsim: enable TODS BIT in null data frame Luca Coelho
@ 2017-12-18 10:14 ` Luca Coelho
1 sibling, 0 replies; 3+ messages in thread
From: Luca Coelho @ 2017-12-18 10:14 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, David Spinadel, Luca Coelho
From: David Spinadel <david.spinadel@intel.com>
Send disconnection reason code to user space even if it's locally
generated, since some tests that check reason code may fail because of
the current behavior.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
net/wireless/nl80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e4522ad5f770..e4dddfb64ced 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -13963,7 +13963,7 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev,
if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex) ||
- (from_ap && reason &&
+ (reason &&
nla_put_u16(msg, NL80211_ATTR_REASON_CODE, reason)) ||
(from_ap &&
nla_put_flag(msg, NL80211_ATTR_DISCONNECTED_BY_AP)) ||
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-18 10:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-18 10:14 [PATCH 0/2] cfg80211/mac80211 patches from our internal tree 2017-12-18 Luca Coelho
2017-12-18 10:14 ` [PATCH 1/2] mac80211_hwsim: enable TODS BIT in null data frame Luca Coelho
2017-12-18 10:14 ` [PATCH 2/2] nl80211: send deauth reason if locally generated Luca Coelho
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.