diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 20:00:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 20:00:17 -0400 |
commit | 3f5785ec31adcb7cafa9135087297a38d9698cf8 (patch) | |
tree | b7d06f14e1aea0292a88c4bc0305ea602f6ebd33 /drivers/net/wireless/iwlwifi/iwl-agn.h | |
parent | 8c1c77ff9be27137fa7cbbf51efedef1a2ae915b (diff) | |
parent | 94265cf5f731c7df29fdfde262ca3e6d51e6828c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
bonding: documentation and code cleanup for resend_igmp
bonding: prevent deadlock on slave store with alb mode (v3)
net: hold rtnl again in dump callbacks
Add Fujitsu 1000base-SX PCI ID to tg3
bnx2x: protect sequence increment with mutex
sch_sfq: fix peek() implementation
isdn: netjet - blacklist Digium TDM400P
via-velocity: don't annotate MAC registers as packed
xen: netfront: hold RTNL when updating features.
sctp: fix memory leak of the ASCONF queue when free asoc
net: make dev_disable_lro use physical device if passed a vlan dev (v2)
net: move is_vlan_dev into public header file (v2)
bug.h: Fix build with CONFIG_PRINTK disabled.
wireless: fix fatal kernel-doc error + warning in mac80211.h
wireless: fix cfg80211.h new kernel-doc warnings
iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
dst: catch uninitialized metrics
be2net: hash key for rss-config cmd not set
bridge: initialize fake_rtable metrics
net: fix __dst_destroy_metrics_generic()
...
Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index fe33fe8aa41..2495fe7a58c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -191,12 +191,10 @@ int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band); | |||
191 | void iwl_setup_rx_handlers(struct iwl_priv *priv); | 191 | void iwl_setup_rx_handlers(struct iwl_priv *priv); |
192 | 192 | ||
193 | /* tx */ | 193 | /* tx */ |
194 | void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq); | 194 | void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq); |
195 | int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, | 195 | int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv, |
196 | struct iwl_tx_queue *txq, | 196 | struct iwl_tx_queue *txq, |
197 | dma_addr_t addr, u16 len, u8 reset, u8 pad); | 197 | dma_addr_t addr, u16 len, u8 reset); |
198 | int iwl_hw_tx_queue_init(struct iwl_priv *priv, | ||
199 | struct iwl_tx_queue *txq); | ||
200 | void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags, | 198 | void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags, |
201 | struct ieee80211_tx_info *info); | 199 | struct ieee80211_tx_info *info); |
202 | int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb); | 200 | int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb); |
@@ -345,6 +343,7 @@ extern int iwl_alive_start(struct iwl_priv *priv); | |||
345 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | 343 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL |
346 | extern int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len); | 344 | extern int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len); |
347 | extern void iwl_testmode_init(struct iwl_priv *priv); | 345 | extern void iwl_testmode_init(struct iwl_priv *priv); |
346 | extern void iwl_testmode_cleanup(struct iwl_priv *priv); | ||
348 | #else | 347 | #else |
349 | static inline | 348 | static inline |
350 | int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | 349 | int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) |
@@ -355,6 +354,10 @@ static inline | |||
355 | void iwl_testmode_init(struct iwl_priv *priv) | 354 | void iwl_testmode_init(struct iwl_priv *priv) |
356 | { | 355 | { |
357 | } | 356 | } |
357 | static inline | ||
358 | void iwl_testmode_cleanup(struct iwl_priv *priv) | ||
359 | { | ||
360 | } | ||
358 | #endif | 361 | #endif |
359 | 362 | ||
360 | #endif /* __iwl_agn_h__ */ | 363 | #endif /* __iwl_agn_h__ */ |