git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[pandora-kernel.git]
/
drivers
/
isdn
/
act2000
/
module.c
diff --git
a/drivers/isdn/act2000/module.c
b/drivers/isdn/act2000/module.c
index
e3e5c13
..
ee2b0b9
100644
(file)
--- a/
drivers/isdn/act2000/module.c
+++ b/
drivers/isdn/act2000/module.c
@@
-442,7
+442,7
@@
act2000_sendbuf(act2000_card *card, int channel, int ack, struct sk_buff *skb)
return 0;
}
skb_reserve(xmit_skb, 19);
-
memcpy(skb_put(xmit_skb, len), skb->data
, len);
+
skb_copy_from_linear_data(skb, skb_put(xmit_skb, len)
, len);
} else {
xmit_skb = skb_clone(skb, GFP_ATOMIC);
if (!xmit_skb) {