git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ehea: Whitespace cleanup
[safe/jmp/linux-2.6]
/
net
/
netrom
/
nr_in.c
diff --git
a/net/netrom/nr_in.c
b/net/netrom/nr_in.c
index
e6dc749
..
6817648
100644
(file)
--- a/
net/netrom/nr_in.c
+++ b/
net/netrom/nr_in.c
@@
-54,7
+54,9
@@
static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
skb_reset_transport_header(skbn);
while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) {
- memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+ skb_copy_from_linear_data(skbo,
+ skb_put(skbn, skbo->len),
+ skbo->len);
kfree_skb(skbo);
}