diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 17:54:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 17:54:29 -0400 |
commit | cc998ff8811530be521f6b316f37ab7676a07938 (patch) | |
tree | a054b3bf4b2ef406bf756a6cfc9be2f9115f17ae /drivers/net/wireless/ath/ath10k/pci.h | |
parent | 57d730924d5cc2c3e280af16a9306587c3a511db (diff) | |
parent | 0d40f75bdab241868c0eb6f97aef9f8b3a66f7b3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking changes from David Miller:
"Noteworthy changes this time around:
1) Multicast rejoin support for team driver, from Jiri Pirko.
2) Centralize and simplify TCP RTT measurement handling in order to
reduce the impact of bad RTO seeding from SYN/ACKs. Also, when
both timestamps and local RTT measurements are available prefer
the later because there are broken middleware devices which
scramble the timestamp.
From Yuchung Cheng.
3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
memory consumed to queue up unsend user data. From Eric Dumazet.
4) Add a "physical port ID" abstraction for network devices, from
Jiri Pirko.
5) Add a "suppress" operation to influence fib_rules lookups, from
Stefan Tomanek.
6) Add a networking development FAQ, from Paul Gortmaker.
7) Extend the information provided by tcp_probe and add ipv6 support,
from Daniel Borkmann.
8) Use RCU locking more extensively in openvswitch data paths, from
Pravin B Shelar.
9) Add SCTP support to openvswitch, from Joe Stringer.
10) Add EF10 chip support to SFC driver, from Ben Hutchings.
11) Add new SYNPROXY netfilter target, from Patrick McHardy.
12) Compute a rate approximation for sending in TCP sockets, and use
this to more intelligently coalesce TSO frames. Furthermore, add
a new packet scheduler which takes advantage of this estimate when
available. From Eric Dumazet.
13) Allow AF_PACKET fanouts with random selection, from Daniel
Borkmann.
14) Add ipv6 support to vxlan driver, from Cong Wang"
Resolved conflicts as per discussion.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
openvswitch: Fix alignment of struct sw_flow_key.
netfilter: Fix build errors with xt_socket.c
tcp: Add missing braces to do_tcp_setsockopt
caif: Add missing braces to multiline if in cfctrl_linkup_request
bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
vxlan: Fix kernel panic on device delete.
net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
icplus: Use netif_running to determine device state
ethernet/arc/arc_emac: Fix huge delays in large file copies
tuntap: orphan frags before trying to set tx timestamp
tuntap: purge socket error queue on detach
qlcnic: use standard NAPI weights
ipv6:introduce function to find route for redirect
bnx2x: VF RSS support - VF side
bnx2x: VF RSS support - PF side
vxlan: Notify drivers for listening UDP port changes
net: usbnet: update addr_assign_type if appropriate
driver/net: enic: update enic maintainers and driver
driver/net: enic: Exposing symbols for Cisco's low latency driver
...
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.h')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h index d2a055a07dc6..871bb339d56d 100644 --- a/drivers/net/wireless/ath/ath10k/pci.h +++ b/drivers/net/wireless/ath/ath10k/pci.h | |||
@@ -152,7 +152,8 @@ struct service_to_pipe { | |||
152 | 152 | ||
153 | enum ath10k_pci_features { | 153 | enum ath10k_pci_features { |
154 | ATH10K_PCI_FEATURE_MSI_X = 0, | 154 | ATH10K_PCI_FEATURE_MSI_X = 0, |
155 | ATH10K_PCI_FEATURE_HW_1_0_WARKAROUND = 1, | 155 | ATH10K_PCI_FEATURE_HW_1_0_WORKAROUND = 1, |
156 | ATH10K_PCI_FEATURE_SOC_POWER_SAVE = 2, | ||
156 | 157 | ||
157 | /* keep last */ | 158 | /* keep last */ |
158 | ATH10K_PCI_FEATURE_COUNT | 159 | ATH10K_PCI_FEATURE_COUNT |
@@ -311,7 +312,7 @@ static inline void ath10k_pci_write32(struct ath10k *ar, u32 offset, | |||
311 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); | 312 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); |
312 | void __iomem *addr = ar_pci->mem; | 313 | void __iomem *addr = ar_pci->mem; |
313 | 314 | ||
314 | if (test_bit(ATH10K_PCI_FEATURE_HW_1_0_WARKAROUND, ar_pci->features)) { | 315 | if (test_bit(ATH10K_PCI_FEATURE_HW_1_0_WORKAROUND, ar_pci->features)) { |
315 | unsigned long irq_flags; | 316 | unsigned long irq_flags; |
316 | 317 | ||
317 | spin_lock_irqsave(&ar_pci->hw_v1_workaround_lock, irq_flags); | 318 | spin_lock_irqsave(&ar_pci->hw_v1_workaround_lock, irq_flags); |
@@ -335,20 +336,22 @@ static inline u32 ath10k_pci_read32(struct ath10k *ar, u32 offset) | |||
335 | return ioread32(ar_pci->mem + offset); | 336 | return ioread32(ar_pci->mem + offset); |
336 | } | 337 | } |
337 | 338 | ||
338 | extern unsigned int ath10k_target_ps; | ||
339 | |||
340 | void ath10k_do_pci_wake(struct ath10k *ar); | 339 | void ath10k_do_pci_wake(struct ath10k *ar); |
341 | void ath10k_do_pci_sleep(struct ath10k *ar); | 340 | void ath10k_do_pci_sleep(struct ath10k *ar); |
342 | 341 | ||
343 | static inline void ath10k_pci_wake(struct ath10k *ar) | 342 | static inline void ath10k_pci_wake(struct ath10k *ar) |
344 | { | 343 | { |
345 | if (ath10k_target_ps) | 344 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); |
345 | |||
346 | if (test_bit(ATH10K_PCI_FEATURE_SOC_POWER_SAVE, ar_pci->features)) | ||
346 | ath10k_do_pci_wake(ar); | 347 | ath10k_do_pci_wake(ar); |
347 | } | 348 | } |
348 | 349 | ||
349 | static inline void ath10k_pci_sleep(struct ath10k *ar) | 350 | static inline void ath10k_pci_sleep(struct ath10k *ar) |
350 | { | 351 | { |
351 | if (ath10k_target_ps) | 352 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); |
353 | |||
354 | if (test_bit(ATH10K_PCI_FEATURE_SOC_POWER_SAVE, ar_pci->features)) | ||
352 | ath10k_do_pci_sleep(ar); | 355 | ath10k_do_pci_sleep(ar); |
353 | } | 356 | } |
354 | 357 | ||