diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-14 15:17:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-14 15:17:37 -0700 |
| commit | a61ebdfdb13a051f707b408d464f63b991aa21e3 (patch) | |
| tree | 4e175cc207463251e4335fdab7dff9fb056f199d /drivers/net/wireless/ath/carl9170/carl9170.h | |
| parent | 9ce12eb16ffb143f3a509da86283ddd0b10bcdb3 (diff) | |
| parent | 77b2f2865956b7573f9b040db7a9f808b434acd1 (diff) | |
| download | op-kernel-dev-a61ebdfdb13a051f707b408d464f63b991aa21e3.zip op-kernel-dev-a61ebdfdb13a051f707b408d464f63b991aa21e3.tar.gz | |
Merge tag 'master-2014-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
pull request: wireless 2014-08-14
Please pull this batch of fixes intended for the 3.17 stream...
Arend van Spriel brings two brcmfmac fixes, one which fixes a memory
leak and one which corrects some merge damage.
Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam.
Rickard Strandqvist does some proper NULL termination after a call
to strncpy.
Ronald Wahl corrects a carl9170 problem with sending URBs with the
wrong endpoint type (resulting in log spam).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/carl9170.h')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/carl9170.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index 8596aba..237d0cd 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h @@ -256,6 +256,7 @@ struct ar9170 { atomic_t rx_work_urbs; atomic_t rx_pool_urbs; kernel_ulong_t features; + bool usb_ep_cmd_is_bulk; /* firmware settings */ struct completion fw_load_wait; |
