netdev - linux-next: manual merge of the net-next tree with the wireless-drivers tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 9 May 2016 10:39:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Kalle Valo <kvalo@...eaurora.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
	Sara Sharon <sara.sharon@...el.com>
Subject: linux-next: manual merge of the net-next tree with the
 wireless-drivers tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

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

between commit:

  5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len")

from the wireless-drivers tree and commit:

  d8fe484470dd ("iwlwifi: mvm: add support for new TX CMD API")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 34731e29c589,bd286fca3776..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@@ -186,10 -294,16 +295,16 @@@ void iwl_mvm_set_tx_cmd(struct iwl_mvm 
  	tx_cmd->tx_flags = cpu_to_le32(tx_flags);
  	/* Total # bytes to be transmitted */
  	tx_cmd->len = cpu_to_le16((u16)skb->len +
 -		(uintptr_t)info->driver_data[0]);
 +		(uintptr_t)skb_info->driver_data[0]);
- 	tx_cmd->next_frame_len = 0;
  	tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
  	tx_cmd->sta_id = sta_id;
+ 
+ 	/* padding is inserted later in transport */
+ 	if (ieee80211_hdrlen(fc) % 4 &&
+ 	    !(tx_cmd->offload_assist & cpu_to_le16(BIT(TX_CMD_OFFLD_AMSDU))))
+ 		tx_cmd->offload_assist |= cpu_to_le16(BIT(TX_CMD_OFFLD_PAD));
+ 
+ 	iwl_mvm_tx_csum(mvm, skb, hdr, info, tx_cmd);
  }
  
  /*