Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97a89a8b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net:wireless:Fix kw issues"

parents 1e6aa1b4 09451680

net/wireless/nl80211.c

+3 −0
Original line number Diff line number Diff line
@@ -7687,6 +7687,9 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev, 
		if (settings->n_ciphers_pairwise > cipher_limit)

			return -EINVAL;



		if (len > sizeof(u32) * NL80211_MAX_NR_CIPHER_SUITES)

			return -EINVAL;



		memcpy(settings->ciphers_pairwise, data, len);



		for (i = 0; i < settings->n_ciphers_pairwise; i++)

net/wireless/sme.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int cfg80211_sme_get_conn_ies(struct wireless_dev *wdev, 
	if (!buf)

		return -ENOMEM;



	if (ies_len) {

	if (ies_len && ies) {

		static const u8 before_extcapa[] = {

			/* not listing IEs expected to be created by driver */

			WLAN_EID_RSN,

net/wireless/util.c

+1 −0
Original line number Diff line number Diff line
@@ -591,6 +591,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr, 
	hdr.frame_control = fc;

	hdr.duration_id = 0;

	hdr.seq_ctrl = 0;

	eth_zero_addr(hdr.addr4);



	skip_header_bytes = ETH_HLEN;

	if (ethertype == ETH_P_AARP || ethertype == ETH_P_IPX) {