diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wimax/i2400m/usb-rx.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wimax/i2400m/usb-rx.c')
| -rw-r--r-- | drivers/net/wimax/i2400m/usb-rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/usb-rx.c b/drivers/net/wimax/i2400m/usb-rx.c index a26483a812a5..e3257681e360 100644 --- a/drivers/net/wimax/i2400m/usb-rx.c +++ b/drivers/net/wimax/i2400m/usb-rx.c | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | * a zillion reads; by serializing, we are throttling. | 58 | * a zillion reads; by serializing, we are throttling. |
| 59 | * | 59 | * |
| 60 | * - RX data processing can get heavy enough so that it is not | 60 | * - RX data processing can get heavy enough so that it is not |
| 61 | * appropiate for doing it in the USB callback; thus we run it in a | 61 | * appropriate for doing it in the USB callback; thus we run it in a |
| 62 | * process context. | 62 | * process context. |
| 63 | * | 63 | * |
| 64 | * We provide a read buffer of an arbitrary size (short of a page); if | 64 | * We provide a read buffer of an arbitrary size (short of a page); if |