diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-31 15:33:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-31 15:33:23 -0700 |
| commit | b7a0925e47031d51041ce9a357edc02fb67d0b1d (patch) | |
| tree | bbcc17c342663a7265ab7e0daa809bf75012854e /drivers/net/wireless/ath/ath10k/bmi.h | |
| parent | 774ad031dd6d2ef840375a662693952b73a3ae71 (diff) | |
| parent | 360d9bb5ee2db4d409448667de606c05b3914d53 (diff) | |
Merge tag 'wireless-drivers-next-for-davem-2015-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
Major changes:
mwifiex:
* add TX DATA Pause support
* add multichannel and TDLS channel switch support
ath10k:
* enable VHT for IBSS
* initial work to support qca99x0 and the corresponding 10.4 firmware branch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/bmi.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/bmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h index 31a990635490..df7c7616533b 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.h +++ b/drivers/net/wireless/ath/ath10k/bmi.h @@ -178,7 +178,7 @@ struct bmi_target_info { }; /* in msec */ -#define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ) +#define BMI_COMMUNICATION_TIMEOUT_HZ (2 * HZ) #define BMI_CE_NUM_TO_TARG 0 #define BMI_CE_NUM_TO_HOST 1 |