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

Commit d9a577c3 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents d6b5075d 9d10849e

drivers/net/wireless/iwlwifi/dvm/rs.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -389,13 +389,6 @@ struct iwl_lq_sta { 
	u8 last_bt_traffic;

	u8 last_bt_traffic;

};

};





static inline u8 num_of_ant(u8 mask)

{

	return  !!((mask) & ANT_A) +

		!!((mask) & ANT_B) +

		!!((mask) & ANT_C);

}



static inline u8 first_antenna(u8 mask)

static inline u8 first_antenna(u8 mask)

{

{

	if (mask & ANT_A)

	if (mask & ANT_A)

drivers/net/wireless/iwlwifi/dvm/tx.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -368,6 +368,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
		goto drop_unlock_priv;

		goto drop_unlock_priv;





	memset(dev_cmd, 0, sizeof(*dev_cmd));

	memset(dev_cmd, 0, sizeof(*dev_cmd));

	dev_cmd->hdr.cmd = REPLY_TX;

	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;

	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;





	/* Total # bytes to be transmitted */

	/* Total # bytes to be transmitted */

drivers/net/wireless/iwlwifi/iwl-config.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,12 @@ enum iwl_led_mode { 
#define ANT_BC		(ANT_B | ANT_C)

#define ANT_BC		(ANT_B | ANT_C)

#define ANT_ABC		(ANT_A | ANT_B | ANT_C)

#define ANT_ABC		(ANT_A | ANT_B | ANT_C)





static inline u8 num_of_ant(u8 mask)

{

	return  !!((mask) & ANT_A) +

		!!((mask) & ANT_B) +

		!!((mask) & ANT_C);

}





/*

/*

 * @max_ll_items: max number of OTP blocks

 * @max_ll_items: max number of OTP blocks

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -283,7 +283,8 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |

			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |

			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 14);

			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 14);





	if (data->valid_rx_ant == 1 || cfg->rx_with_siso_diversity) {

	if (num_of_ant(data->valid_rx_ant) == 1 ||

	    cfg->rx_with_siso_diversity) {

		vht_cap->cap |= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |

		vht_cap->cap |= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |

				IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;

				IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;

		/* this works because NOT_SUPPORTED == 3 */

		/* this works because NOT_SUPPORTED == 3 */

drivers/net/wireless/iwlwifi/iwl-prph.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,9 @@ 
/* Device system time */

/* Device system time */

#define DEVICE_SYSTEM_TIME_REG 0xA0206C

#define DEVICE_SYSTEM_TIME_REG 0xA0206C





/* Device NMI register */

#define DEVICE_SET_NMI_REG 0x00a01c30



/*****************************************************************************

/*****************************************************************************

 *                        7000/3000 series SHR DTS addresses                 *

 *                        7000/3000 series SHR DTS addresses                 *

 *****************************************************************************/

 *****************************************************************************/