diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/net/usb/rmnet_usb_ctrl.h | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/net/usb/rmnet_usb_ctrl.h')
-rw-r--r-- | drivers/net/usb/rmnet_usb_ctrl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/usb/rmnet_usb_ctrl.h b/drivers/net/usb/rmnet_usb_ctrl.h index f6e5876..cc14cff 100644 --- a/drivers/net/usb/rmnet_usb_ctrl.h +++ b/drivers/net/usb/rmnet_usb_ctrl.h @@ -18,6 +18,7 @@ #include <linux/cdev.h> #include <linux/usb/ch9.h> #include <linux/usb/cdc.h> +#include <linux/wakelock.h> #define CTRL_DEV_MAX_LEN 10 @@ -46,6 +47,8 @@ struct rmnet_ctrl_dev { unsigned is_opened; + bool is_connected; + /*input control lines (DSR, CTS, CD, RI)*/ unsigned int cbits_tolocal; @@ -66,6 +69,14 @@ struct rmnet_ctrl_dev { unsigned int resp_avail_cnt; unsigned int set_ctrl_line_state_cnt; unsigned int tx_ctrl_err_cnt; + unsigned int zlp_cnt; + unsigned int tx_ctrl_in_req_cnt; + + struct wake_lock ctrl_wake; + + /* reset handler */ + struct notifier_block reset_notifier_block; + bool tx_block; }; extern struct rmnet_ctrl_dev *ctrl_dev[]; |