diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /net/irda/wrapper.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/irda/wrapper.c')
| -rw-r--r-- | net/irda/wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c index e71286768a4..c246983308b 100644 --- a/net/irda/wrapper.c +++ b/net/irda/wrapper.c | |||
| @@ -238,7 +238,7 @@ async_bump(struct net_device *dev, | |||
| 238 | skb_reserve(newskb, 1); | 238 | skb_reserve(newskb, 1); |
| 239 | 239 | ||
| 240 | if(docopy) { | 240 | if(docopy) { |
| 241 | /* Copy data without CRC (lenght already checked) */ | 241 | /* Copy data without CRC (length already checked) */ |
| 242 | skb_copy_to_linear_data(newskb, rx_buff->data, | 242 | skb_copy_to_linear_data(newskb, rx_buff->data, |
| 243 | rx_buff->len - 2); | 243 | rx_buff->len - 2); |
| 244 | /* Deliver this skb */ | 244 | /* Deliver this skb */ |