diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/simeth.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/xpnet.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index edef008c2b42..f26077a773d5 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c | |||
@@ -473,7 +473,7 @@ simeth_rx(struct net_device *dev) | |||
473 | * XXX Fix me | 473 | * XXX Fix me |
474 | * Should really do a csum+copy here | 474 | * Should really do a csum+copy here |
475 | */ | 475 | */ |
476 | memcpy(skb->data, frame, len); | 476 | skb_copy_to_linear_data(skb, frame, len); |
477 | #endif | 477 | #endif |
478 | skb->protocol = eth_type_trans(skb, dev); | 478 | skb->protocol = eth_type_trans(skb, dev); |
479 | 479 | ||
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c index 9fc02654f0f5..5419acb89a8c 100644 --- a/arch/ia64/sn/kernel/xpnet.c +++ b/arch/ia64/sn/kernel/xpnet.c | |||
@@ -233,7 +233,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) | |||
233 | "%lu)\n", skb->data, &msg->data, | 233 | "%lu)\n", skb->data, &msg->data, |
234 | (size_t) msg->embedded_bytes); | 234 | (size_t) msg->embedded_bytes); |
235 | 235 | ||
236 | memcpy(skb->data, &msg->data, (size_t) msg->embedded_bytes); | 236 | skb_copy_to_linear_data(skb, &msg->data, (size_t)msg->embedded_bytes); |
237 | } else { | 237 | } else { |
238 | dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t" | 238 | dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t" |
239 | "bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa, | 239 | "bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa, |