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
[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}
[safe/jmp/linux-2.6]
/
drivers
/
atm
/
nicstar.c
diff --git
a/drivers/atm/nicstar.c
b/drivers/atm/nicstar.c
index
26f4b70
..
14ced85
100644
(file)
--- a/
drivers/atm/nicstar.c
+++ b/
drivers/atm/nicstar.c
@@
-2395,7
+2395,7
@@
static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
skb->destructor = ns_lb_destructor;
#endif /* NS_USE_DESTRUCTORS */
skb_push(skb, NS_SMBUFSIZE);
skb->destructor = ns_lb_destructor;
#endif /* NS_USE_DESTRUCTORS */
skb_push(skb, NS_SMBUFSIZE);
-
memcpy(skb->data, s
b->data, NS_SMBUFSIZE);
+
skb_copy_from_linear_data(sb, sk
b->data, NS_SMBUFSIZE);
skb_put(skb, len - NS_SMBUFSIZE);
ATM_SKB(skb)->vcc = vcc;
__net_timestamp(skb);
skb_put(skb, len - NS_SMBUFSIZE);
ATM_SKB(skb)->vcc = vcc;
__net_timestamp(skb);
@@
-2479,7
+2479,7
@@
static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
{
/* Copy the small buffer to the huge buffer */
sb = (struct sk_buff *) iov->iov_base;
{
/* Copy the small buffer to the huge buffer */
sb = (struct sk_buff *) iov->iov_base;
-
memcpy(hb->data, s
b->data, iov->iov_len);
+
skb_copy_from_linear_data(sb, h
b->data, iov->iov_len);
skb_put(hb, iov->iov_len);
remaining = len - iov->iov_len;
iov++;
skb_put(hb, iov->iov_len);
remaining = len - iov->iov_len;
iov++;
@@
-2491,7
+2491,7
@@
static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
{
lb = (struct sk_buff *) iov->iov_base;
tocopy = min_t(int, remaining, iov->iov_len);
{
lb = (struct sk_buff *) iov->iov_base;
tocopy = min_t(int, remaining, iov->iov_len);
-
memcpy(skb_tail_pointer(hb), lb->data
, tocopy);
+
skb_copy_from_linear_data(lb, skb_tail_pointer(hb)
, tocopy);
skb_put(hb, tocopy);
iov++;
remaining -= tocopy;
skb_put(hb, tocopy);
iov++;
remaining -= tocopy;