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

Commit ae96d333 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2017-10-13' of... 

Merge tag 'mac80211-next-for-davem-2017-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Three fixes for the recently added new code:
 * make "make -s" silent for the certs file (Arnd)
 * fix missing CONFIG_ in extra certs symbol (Arnd)
 * use crypto_aead_authsize() to use the proper API
and two other changes:
 * remove a set-but-unused variable
 * don't track HT *capability* changes, capabilities
   are supposed to be constant (HT operation changes)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f013820f b1b1ae2c

net/mac80211/aead_api.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,

		 u8 *data, size_t data_len, u8 *mic)

{

	size_t mic_len = tfm->authsize;

	size_t mic_len = crypto_aead_authsize(tfm);

	struct scatterlist sg[3];

	struct aead_request *aead_req;

	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
@@ -52,7 +52,7 @@ int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len, 
int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,

		 u8 *data, size_t data_len, u8 *mic)

{

	size_t mic_len = tfm->authsize;

	size_t mic_len = crypto_aead_authsize(tfm);

	struct scatterlist sg[3];

	struct aead_request *aead_req;

	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);

net/mac80211/mlme.c

+3 −11
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ static u32 
ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,

			     struct ieee80211_supported_band *sband,

			     struct ieee80211_channel *channel,

			     const struct ieee80211_ht_cap *ht_cap,

			     const struct ieee80211_ht_operation *ht_oper,

			     const struct ieee80211_vht_operation *vht_oper,

			     struct cfg80211_chan_def *chandef, bool tracking)
@@ -163,20 +162,13 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 
	chandef->center_freq1 = channel->center_freq;

	chandef->center_freq2 = 0;



	if (!ht_cap || !ht_oper || !sta_ht_cap.ht_supported) {

	if (!ht_oper || !sta_ht_cap.ht_supported) {

		ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT;

		goto out;

	}



	chandef->width = NL80211_CHAN_WIDTH_20;



	if (!(ht_cap->cap_info &

	      cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40))) {

		ret = IEEE80211_STA_DISABLE_40MHZ;

		vht_chandef = *chandef;

		goto out;

	}



	ht_cfreq = ieee80211_channel_to_frequency(ht_oper->primary_chan,

						  channel->band);

	/* check that channel matches the right operating channel */
@@ -344,7 +336,7 @@ static int ieee80211_config_bw(struct ieee80211_sub_if_data *sdata, 


	/* calculate new channel (type) based on HT/VHT operation IEs */

	flags = ieee80211_determine_chantype(sdata, sband, chan,

					     ht_cap, ht_oper, vht_oper,

					     ht_oper, vht_oper,

					     &chandef, true);



	/*
@@ -4312,7 +4304,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, 


	ifmgd->flags |= ieee80211_determine_chantype(sdata, sband,

						     cbss->channel,

						     ht_cap, ht_oper, vht_oper,

						     ht_oper, vht_oper,

						     &chandef, false);



	sdata->needed_rx_chains = min(ieee80211_ht_vht_rx_chains(sdata, cbss),

net/wireless/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ cfg80211-y += extra-certs.o 
endif



$(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.x509)

	@echo "  GEN     $@"

	@$(kecho) "  GEN     $@"

	@echo '#include "reg.h"' > $@

	@echo 'const u8 shipped_regdb_certs[] = {' >> $@

	@for f in $^ ; do hexdump -v -e '1/1 "0x%.2x," "\n"' < $$f >> $@ ; done
@@ -32,7 +32,7 @@ $(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.x509) 


$(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \

		      $(wildcard $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%)/*.x509)

	@echo "  GEN     $@"

	@$(kecho) "  GEN     $@"

	@echo '#include "reg.h"' > $@

	@echo 'const u8 extra_regdb_certs[] = {' >> $@

	@for f in $^ ; do test -f $$f && hexdump -v -e '1/1 "0x%.2x," "\n"' < $$f >> $@ || true ; done

net/wireless/chan.c

+1 −3
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ bool cfg80211_is_sub_chan(struct cfg80211_chan_def *chandef, 
			  struct ieee80211_channel *chan)

{

	int width;

	u32 cf_offset, freq;

	u32 freq;



	if (chandef->chan->center_freq == chan->center_freq)

		return true;
@@ -473,8 +473,6 @@ bool cfg80211_is_sub_chan(struct cfg80211_chan_def *chandef, 
	if (width <= 20)

		return false;



	cf_offset = width / 2 - 10;



	for (freq = chandef->center_freq1 - width / 2 + 10;

	     freq <= chandef->center_freq1 + width / 2 - 10; freq += 20) {

		if (chan->center_freq == freq)

net/wireless/reg.c

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static int __init load_builtin_regdb_keys(void) 
#ifdef CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS

	load_keys_from_buffer(shipped_regdb_certs, shipped_regdb_certs_len);

#endif

#ifdef CFG80211_EXTRA_REGDB_KEYDIR

#ifdef CONFIG_CFG80211_EXTRA_REGDB_KEYDIR

	if (CONFIG_CFG80211_EXTRA_REGDB_KEYDIR[0] != '\0')

		load_keys_from_buffer(extra_regdb_certs, extra_regdb_certs_len);

#endif