diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:43 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:47 -0400 |
| commit | aff364860aa105b2deacc6f21ec8ef524460e3fc (patch) | |
| tree | 18409ebe16b25b141598da9b6386d69416c06afa /include/linux/usb/usbnet.h | |
| parent | c7a7b814c9dca9ee01b38e63b4a46de87156d3b6 (diff) | |
| parent | 993ba1585cbb03fab012e41d1a5d24330a283b31 (diff) | |
Merge branch 'x86/numa' into x86-mm
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.
3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
993ba1585c: x86-32, numa: Update remap allocator comments
Scheduled NUMA init 32/64bit unification changes depend on them.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 201f2228f73..3c7329b8ea0 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -97,6 +97,8 @@ struct driver_info { | |||
| 97 | 97 | ||
| 98 | #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ | 98 | #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ |
| 99 | 99 | ||
| 100 | #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ | ||
| 101 | |||
| 100 | /* | 102 | /* |
| 101 | * Indicates to usbnet, that USB driver accumulates multiple IP packets. | 103 | * Indicates to usbnet, that USB driver accumulates multiple IP packets. |
| 102 | * Affects statistic (counters) and short packet handling. | 104 | * Affects statistic (counters) and short packet handling. |