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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
zd1211rw
/
zd_usb.h
diff --git
a/drivers/net/wireless/zd1211rw/zd_usb.h
b/drivers/net/wireless/zd1211rw/zd_usb.h
index
3924258
..
bf94284
100644
(file)
--- a/
drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/
drivers/net/wireless/zd1211rw/zd_usb.h
@@
-183,6
+183,7
@@
struct zd_usb_rx {
spinlock_t lock;
struct mutex setup_mutex;
struct delayed_work idle_work;
+ struct tasklet_struct reset_timer_tasklet;
u8 fragment[2 * USB_MAX_RX_SIZE];
unsigned int fragment_length;
unsigned int usb_packet_size;