hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

caif: use pskb_put() instead of reimplementing its functionality 

Also remove the warning for fragmented packets -- skb_cow_data() will
linearize the buffer, removing all fragments.

Signed-off-by: Mathias Krause <mathias.krause@secunet.com>
Cc: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mathias Krause 2013-11-07 14:18:25 +01:00 committed by David S. Miller
parent 0c7ddf36c2
commit 253c6daa34
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/caif/cfpkt_skbuff.c
View File

@ -203,20 +203,10 @@ int cfpkt_add_body(struct cfpkt *pkt, const void *data, u16 len)
PKT_ERROR(pkt, "cow failed\n"); PKT_ERROR(pkt, "cow failed\n");
return -EPROTO; return -EPROTO;
} }
/*
* Is the SKB non-linear after skb_cow_data()? If so, we are
* going to add data to the last SKB, so we need to adjust
* lengths of the top SKB.
*/
if (lastskb != skb) {
pr_warn("Packet is non-linear\n");
skb->len += len;
skb->data_len += len;
}
} }
/* All set to put the last SKB and optionally write data there. */ /* All set to put the last SKB and optionally write data there. */
to = skb_put(lastskb, len); to = pskb_put(skb, lastskb, len);
if (likely(data)) if (likely(data))
memcpy(to, data, len); memcpy(to, data, len);
return 0; return 0;