diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 14:51:28 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 14:51:28 -0500 |
| commit | 87bc0728d462ae37841a550542829aa65a97e7c2 (patch) | |
| tree | 266afb90f501b814c0a79f10a7afd86a6a33d631 /drivers/net/wireless/ath/ath10k/pci.h | |
| parent | f421436a591d34fa5279b54a96ac07d70250cc8d (diff) | |
| parent | 01925efdf7e03b4b803b5c9f985163d687f7f017 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h index 7c49f6f96f70..52fb7b973571 100644 --- a/drivers/net/wireless/ath/ath10k/pci.h +++ b/drivers/net/wireless/ath/ath10k/pci.h | |||
| @@ -178,9 +178,6 @@ struct ath10k_pci_pipe { | |||
| 178 | /* List of free CE completion slots */ | 178 | /* List of free CE completion slots */ |
| 179 | struct list_head compl_free; | 179 | struct list_head compl_free; |
| 180 | 180 | ||
| 181 | /* Limit the number of outstanding send requests. */ | ||
| 182 | int num_sends_allowed; | ||
| 183 | |||
| 184 | struct ath10k_pci *ar_pci; | 181 | struct ath10k_pci *ar_pci; |
| 185 | struct tasklet_struct intr; | 182 | struct tasklet_struct intr; |
| 186 | }; | 183 | }; |