git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
wl1251
/
tx.c
diff --git
a/drivers/net/wireless/wl1251/tx.c
b/drivers/net/wireless/wl1251/tx.c
index
28121c5
..
a02cc87
100644
(file)
--- a/
drivers/net/wireless/wl1251/tx.c
+++ b/
drivers/net/wireless/wl1251/tx.c
@@
-50,7
+50,7
@@
static bool wl1251_tx_double_buffer_busy(struct wl1251 *wl, u32 data_out_count)
return false;
}
return false;
}
-
static
int wl1251_tx_path_status(struct wl1251 *wl)
+int wl1251_tx_path_status(struct wl1251 *wl)
{
u32 status, addr, data_out_count;
bool busy;
{
u32 status, addr, data_out_count;
bool busy;
@@
-278,7
+278,7
@@
static void wl1251_tx_trigger(struct wl1251 *wl)
}
/* caller must hold wl->mutex */
}
/* caller must hold wl->mutex */
-
static
int wl1251_tx_frame(struct wl1251 *wl, struct sk_buff *skb)
+int wl1251_tx_frame(struct wl1251 *wl, struct sk_buff *skb)
{
struct ieee80211_tx_info *info;
int ret = 0;
{
struct ieee80211_tx_info *info;
int ret = 0;
@@
-523,6
+523,7
@@
void wl1251_tx_complete(struct wl1251 *wl)
}
wl->next_tx_complete = result_index;
}
wl->next_tx_complete = result_index;
+ wl->last_io_jiffies = jiffies;
}
/* caller must hold wl->mutex */
}
/* caller must hold wl->mutex */