Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: drivers/net/usb/gobi/structs.h

Issue 6913008: CHROMIUM: gobi: Remove worker.exit hack. (Closed) Base URL: ssh://gitrw.chromium.org:9222/kernel.git@0.12.433.B
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « drivers/net/usb/gobi/qcusbnet.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* structs.h - shared structures 1 /* structs.h - shared structures
2 * Copyright (c) 2010, Code Aurora Forum. All rights reserved. 2 * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
3 3
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 and 5 * it under the terms of the GNU General Public License version 2 and
6 * only version 2 as published by the Free Software Foundation. 6 * only version 2 as published by the Free Software Foundation.
7 7
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 12
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program; if not, write to the Free Software 14 * along with this program; if not, write to the Free Software
15 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 15 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
16 * 02110-1301, USA. 16 * 02110-1301, USA.
17 */ 17 */
18 18
19 #ifndef QCUSBNET_STRUCTS_H 19 #ifndef QCUSBNET_STRUCTS_H
20 #define QCUSBNET_STRUCTS_H 20 #define QCUSBNET_STRUCTS_H
21 21
22 #include <linux/etherdevice.h> 22 #include <linux/etherdevice.h>
23 #include <linux/ethtool.h> 23 #include <linux/ethtool.h>
24 #include <linux/mii.h> 24 #include <linux/mii.h>
25 #include <linux/usb.h> 25 #include <linux/usb.h>
26 #include <linux/version.h> 26 #include <linux/version.h>
27 #include <linux/cdev.h> 27 #include <linux/cdev.h>
28 #include <linux/kobject.h> 28 #include <linux/kobject.h>
29 #include <linux/kthread.h> 29 #include <linux/kthread.h>
30 #include <linux/wait.h>
30 31
31 #include <linux/usb/usbnet.h> 32 #include <linux/usb/usbnet.h>
32 33
33 #include <linux/fdtable.h> 34 #include <linux/fdtable.h>
34 35
35 #define DBG(fmt, arg...) \ 36 #define DBG(fmt, arg...) \
36 do { \ 37 do { \
37 if (qcusbnet_debug == 1) \ 38 if (qcusbnet_debug == 1) \
38 printk(KERN_INFO "QCUSBNet2k::%s " fmt, __func__, ##arg); \ 39 printk(KERN_INFO "QCUSBNet2k::%s " fmt, __func__, ##arg); \
39 } while (0) 40 } while (0)
40 41
41 struct qcusbnet; 42 struct qcusbnet;
42 43
43 struct urbreq { 44 struct urbreq {
44 struct list_head node; 45 struct list_head node;
45 struct urb *urb; 46 struct urb *urb;
46 }; 47 };
47 48
48 #define DEFAULT_READ_URB_LENGTH 0x1000 49 #define DEFAULT_READ_URB_LENGTH 0x1000
49 50
50 struct worker { 51 struct worker {
51 struct task_struct *thread; 52 struct task_struct *thread;
52 » int exit; 53 » atomic_t work_count;
53 » struct completion work; 54 » wait_queue_head_t waitq;
54 struct list_head urbs; 55 struct list_head urbs;
55 spinlock_t urbs_lock; 56 spinlock_t urbs_lock;
56 struct urb *active; 57 struct urb *active;
57 spinlock_t active_lock; 58 spinlock_t active_lock;
58 struct usb_interface *iface; 59 struct usb_interface *iface;
59 }; 60 };
60 61
61 struct qmidev { 62 struct qmidev {
62 dev_t devnum; 63 dev_t devnum;
63 struct class *devclass; 64 struct class *devclass;
(...skipping 24 matching lines...) Expand all
88 int (*stop)(struct net_device *); 89 int (*stop)(struct net_device *);
89 unsigned long down; 90 unsigned long down;
90 bool valid; 91 bool valid;
91 bool dying; 92 bool dying;
92 struct qmidev qmi; 93 struct qmidev qmi;
93 char meid[14]; 94 char meid[14];
94 struct worker worker; 95 struct worker worker;
95 }; 96 };
96 97
97 #endif /* !QCUSBNET_STRUCTS_H */ 98 #endif /* !QCUSBNET_STRUCTS_H */
OLDNEW
« no previous file with comments | « drivers/net/usb/gobi/qcusbnet.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698