diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /drivers/net/wireless/iwmc3200wifi/iwm.h | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/iwm.h')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/iwm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h index 5a26bb05a33a..79ffa3b98d73 100644 --- a/drivers/net/wireless/iwmc3200wifi/iwm.h +++ b/drivers/net/wireless/iwmc3200wifi/iwm.h | |||
| @@ -349,7 +349,7 @@ int iwm_up(struct iwm_priv *iwm); | |||
| 349 | int iwm_down(struct iwm_priv *iwm); | 349 | int iwm_down(struct iwm_priv *iwm); |
| 350 | 350 | ||
| 351 | /* TX API */ | 351 | /* TX API */ |
| 352 | u16 iwm_tid_to_queue(u16 tid); | 352 | int iwm_tid_to_queue(u16 tid); |
| 353 | void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages); | 353 | void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages); |
| 354 | void iwm_tx_worker(struct work_struct *work); | 354 | void iwm_tx_worker(struct work_struct *work); |
| 355 | int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev); | 355 | int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev); |