diff options
| author | Luciano Coelho <coelho@ti.com> | 2012-06-26 22:43:29 +0300 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-06-26 22:43:29 +0300 |
| commit | a572ac1a3d37440dc9daf69f9ad63243bef6893f (patch) | |
| tree | 4f2f66f8849118c4e7d0288825e779e9b8fcfef0 /drivers/net/wireless/ti/wlcore/tx.h | |
| parent | 6bcfe67f9865fb51ec78fc9b09887375db7e08b5 (diff) | |
| parent | 680c6055b9bebdf07fc2d5ebe816a14c7daecdc1 (diff) | |
Merge branch 'wl12xx-next' into for-linville
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/tx.h')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/tx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/tx.h b/drivers/net/wireless/ti/wlcore/tx.h index fa4be1b9113..1e939b01615 100644 --- a/drivers/net/wireless/ti/wlcore/tx.h +++ b/drivers/net/wireless/ti/wlcore/tx.h @@ -234,8 +234,8 @@ static inline int wl1271_tx_total_queue_count(struct wl1271 *wl) } void wl1271_tx_work(struct work_struct *work); -void wl1271_tx_work_locked(struct wl1271 *wl); -void wl1271_tx_complete(struct wl1271 *wl); +int wlcore_tx_work_locked(struct wl1271 *wl); +int wlcore_tx_complete(struct wl1271 *wl); void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif); void wl12xx_tx_reset(struct wl1271 *wl); void wl1271_tx_flush(struct wl1271 *wl); |