Merge tag 'wireless-drivers-2020-03-05' of... (2f63f2d5) · Commits · 戴 / test

Merge tag 'wireless-drivers-2020-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers Kalle Valo says: ==================== wireless-drivers fixes for v5.6 Second set of fixes for v5.6. Only two small fixes this time. iwlwifi * fix another initialisation regression with 3168 devices mt76 * fix memory corruption with too many rx fragments ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
		}

		/* PHY_SKU section is mandatory in B0 */
		if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
		if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT &&
		!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
		IWL_ERR(mvm,
		"Can't parse phy_sku in B0, empty sections\n");
		return NULL;

drivers/net/wireless/mediatek/mt76/dma.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -447,10 +447,13 @@ mt76_add_fragment(struct mt76_dev dev, struct mt76_queue q, void *data,
		struct page *page = virt_to_head_page(data);
		int offset = data - page_address(page);
		struct sk_buff *skb = q->rx_head;
		struct skb_shared_info *shinfo = skb_shinfo(skb);

		if (shinfo->nr_frags < ARRAY_SIZE(shinfo->frags)) {
		offset += q->buf_offset;
		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, offset, len,
		skb_add_rx_frag(skb, shinfo->nr_frags, page, offset, len,
		q->buf_size);
		}

		if (more)
		return;

Admin message