Merge tag 'iwlwifi-for-kalle-2019-04-28' of... (5c403533) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/cfg/5000.c

+2 −1

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
		* Copyright(c) 2018 Intel Corporation
		* Copyright(c) 2018 - 2019 Intel Corporation
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of version 2 of the GNU General Public License as
		@@ -136,6 +136,7 @@ const struct iwl_cfg iwl5350_agn_cfg = {
		.ht_params = &iwl5000_ht_params,
		.led_mode = IWL_LED_BLINK,
		.internal_wimax_coex = true,
		.csr = &iwl_csr_v1,
		};

		#define IWL_DEVICE_5150 \

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -780,12 +780,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm mvm, struct ieee80211_vif vif)
		return;
		}

		if (!mvmvif->dbgfs_dir) {
		IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
		dbgfs_dir);
		return;
		}

		if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&
		((vif->type == NL80211_IFTYPE_STATION && !vif->p2p) \|\|
		(vif->type == NL80211_IFTYPE_STATION && vif->p2p)))

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

+24 −4

Original line number	Diff line number	Diff line
		@@ -169,8 +169,8 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm mvm, struct sk_buff skb,
		}

		/* iwl_mvm_create_skb Adds the rxb to a new skb */
		static void iwl_mvm_create_skb(struct sk_buff skb, struct ieee80211_hdr hdr,
		u16 len, u8 crypt_len,
		static int iwl_mvm_create_skb(struct iwl_mvm mvm, struct sk_buff skb,
		struct ieee80211_hdr *hdr, u16 len, u8 crypt_len,
		struct iwl_rx_cmd_buffer *rxb)
		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		@@ -204,6 +204,20 @@ static void iwl_mvm_create_skb(struct sk_buff skb, struct ieee80211_hdr hdr,
		* present before copying packet data.
		*/
		hdrlen += crypt_len;

		if (WARN_ONCE(headlen < hdrlen,
		"invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n",
		hdrlen, len, crypt_len)) {
		/*
		* We warn and trace because we want to be able to see
		* it in trace-cmd as well.
		*/
		IWL_DEBUG_RX(mvm,
		"invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n",
		hdrlen, len, crypt_len);
		return -EINVAL;
		}

		skb_put_data(skb, hdr, hdrlen);
		skb_put_data(skb, (u8 *)hdr + hdrlen + pad_len, headlen - hdrlen);

		@@ -216,6 +230,8 @@ static void iwl_mvm_create_skb(struct sk_buff skb, struct ieee80211_hdr hdr,
		skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,
		fraglen, rxb->truesize);
		}

		return 0;
		}

		static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,
		@@ -1671,7 +1687,11 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm mvm, struct napi_struct napi,
		rx_status->boottime_ns = ktime_get_boot_ns();
		}

		iwl_mvm_create_skb(skb, hdr, len, crypt_len, rxb);
		if (iwl_mvm_create_skb(mvm, skb, hdr, len, crypt_len, rxb)) {
		kfree_skb(skb);
		goto out;
		}

		if (!iwl_mvm_reorder(mvm, napi, queue, sta, skb, desc))
		iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue,
		sta, csi);

Admin message