Merge remote-tracking branch 'qcom/lineage-20' into lineage-21

Change-Id: I24426c163c47922c588a4342f19d897cad85b464
LineageOS · Jan 19, 2025 · acabb3a · acabb3a
2 parents a611c2c + 6170e74
commit acabb3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
@@ -4273,6 +4273,7 @@ enum nl80211_mfp {
 enum nl80211_wpa_versions {
 	NL80211_WPA_VERSION_1 = 1 << 0,
 	NL80211_WPA_VERSION_2 = 1 << 1,
+	NL80211_WPA_VERSION_3 = 1 << 2,
 };
 
 /**

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
@@ -8235,7 +8235,8 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
 static bool nl80211_valid_wpa_versions(u32 wpa_versions)
 {
 	return !(wpa_versions & ~(NL80211_WPA_VERSION_1 |
-				  NL80211_WPA_VERSION_2));
+				  NL80211_WPA_VERSION_2 |
+				  NL80211_WPA_VERSION_3));
 }
 
 static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)

diff --git a/techpack/audio/4.0/asoc/codecs/wcd-mbhc-v2.c b/techpack/audio/4.0/asoc/codecs/wcd-mbhc-v2.c
@@ -670,7 +670,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
 			mbhc->jiffies_atreport = jiffies;
 		} else if (jack_type == SND_JACK_LINEOUT) {
 			mbhc->current_plug = MBHC_PLUG_TYPE_HIGH_HPH;
-		else {
+		} else {
 			pr_debug("%s: invalid Jack type %d\n",__func__, jack_type);
 		}