aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax/i2400m
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/wimax/i2400m
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/net/wimax/i2400m')
-rw-r--r--drivers/net/wimax/i2400m/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 07c32e68909f..99d27473ba3f 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -1114,7 +1114,7 @@ error:
1114 * device. See the file header for the format. Run all checks on the 1114 * device. See the file header for the format. Run all checks on the
1115 * buffer header, then run over each payload's descriptors, verify 1115 * buffer header, then run over each payload's descriptors, verify
1116 * their consistency and act on each payload's contents. If 1116 * their consistency and act on each payload's contents. If
1117 * everything is succesful, update the device's statistics. 1117 * everything is successful, update the device's statistics.
1118 * 1118 *
1119 * Note: You need to set the skb to contain only the length of the 1119 * Note: You need to set the skb to contain only the length of the
1120 * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE). 1120 * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE).