diff options
| author | Kees Cook <keescook@google.com> | 2016-03-08 09:56:09 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@google.com> | 2016-03-08 09:56:09 -0800 |
| commit | 2ad1a30bbdffd6f53c33bb8562a8eef7f4732310 (patch) | |
| tree | 19a0625964fd70e51ac8ee4c1041a65b6c24d3be /drivers/net/wireless/uccp420wlan/inc/umac_if.h | |
| parent | d12b59f861a0eb9b4313ea5a8993989cf6e80f2a (diff) | |
| parent | babe638e91d0f2804b3d7357e4aa575f8fa2248b (diff) | |
| download | v4.1-2ad1a30bbdffd6f53c33bb8562a8eef7f4732310.tar.gz | |
Merge branch 'master' into update
Diffstat (limited to 'drivers/net/wireless/uccp420wlan/inc/umac_if.h')
| -rw-r--r-- | drivers/net/wireless/uccp420wlan/inc/umac_if.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/uccp420wlan/inc/umac_if.h b/drivers/net/wireless/uccp420wlan/inc/umac_if.h index cd6ba74be3e..4810619d02a 100644 --- a/drivers/net/wireless/uccp420wlan/inc/umac_if.h +++ b/drivers/net/wireless/uccp420wlan/inc/umac_if.h @@ -33,6 +33,8 @@ #include "hal.h" #include "host_umac_if.h" +#define UMAC_ROC_AC WLAN_AC_VO + struct umac_key { unsigned char *peer_mac; unsigned char *tx_mic; @@ -184,6 +186,7 @@ extern int uccp420wlan_prog_mcast_filter_control(unsigned int extern int uccp420wlan_prog_rcv_bcn_mode(unsigned int bcn_rcv_mode); extern int uccp420wlan_prog_aux_adc_chain(unsigned int chain_id); +extern int uccp420wlan_prog_cont_tx(int val); extern int uccp420wlan_prog_txq_params(int index, unsigned char *vif_addr, unsigned int queue, @@ -235,7 +238,8 @@ extern int uccp420wlan_prog_vht_bform(unsigned int vht_beamform_status, extern int uccp420wlan_prog_roc(unsigned int roc_status, unsigned int roc_channel, - unsigned int roc_duration); + unsigned int roc_duration, + unsigned int roc_type); #ifdef CONFIG_PM extern int uccp420wlan_prog_econ_ps_state(int if_index, |