On 26/03/14 20:12, David Miller wrote:
From: David Miller <davem@xxxxxxxxxxxxx>
Date: Wed, 26 Mar 2014 15:59:58 -0400 (EDT)
From: Zoltan Kiss <zoltan.kiss@xxxxxxxxxx>
Date: Fri, 21 Mar 2014 10:31:34 +0000
skb_zerocopy can copy elements of the frags array between skbs, but it doesn't
orphan them. Also, it doesn't handle errors, so this patch takes care of that
as well, and modify the callers accordingly. skb_tx_error() is also added to
the callers so they will signal the failed delivery towards the creator of the
skb.
Signed-off-by: Zoltan Kiss <zoltan.kiss@xxxxxxxxxx>
Applied, thanks Zoltan.
Actually, Zoltan, you have to fix this:
net/core/skbuff.c: In function ʽskb_zerocopyʼ:
net/core/skbuff.c:2172:2: warning: passing argument 1 of ʽskb_orphan_fragsʼ discards ʽconstʼ qualifi
er from pointer target type [enabled by default]
In file included from include/linux/tcp.h:21:0,
from net/core/skbuff.c:50:
include/linux/skbuff.h:1904:19: note: expected ʽstruct sk_buff *ʼ but argument is of type ʽconst str
uct sk_buff *ʼ
net/core/skbuff.c:2173:3: warning: passing argument 1 of ʽskb_tx_errorʼ discards ʽconstʼ qualifier f
rom pointer target type [enabled by default]
net/core/skbuff.c:642:6: note: expected ʽstruct sk_buff *ʼ but argument is of type ʽconst struct sk_
buff *ʼ
Ok, resubmitted. 'from' is now not a const parameter, because
skb->pfmemalloc might change.
Zoli
--
To unsubscribe from this list: send the line "unsubscribe netfilter" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
