| Message ID | 1428455025-5945-1-git-send-email-ast@plumgrid.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 04/08/2015 03:03 AM, Alexei Starovoitov wrote: > similar to skb_postpull_rcsum() introduce skb_postpush_rcsum() helper > > Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> This one you could resend nevertheless as a stand-alone as it also improves the existing parts. Would be good if you could also add a proper kernel doc part as in skb_postpull_rcsum(). Acked-by: Daniel Borkmann <daniel@iogearbox.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 36f3f43c0117..3c5b191869bb 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2586,6 +2586,13 @@ static inline void skb_postpull_rcsum(struct sk_buff *skb, skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0)); } +static inline void skb_postpush_rcsum(struct sk_buff *skb, + const void *start, unsigned int len) +{ + if (skb->ip_summed == CHECKSUM_COMPLETE) + skb->csum = csum_add(skb->csum, csum_partial(start, len, 0)); +} + unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len); /** diff --git a/net/core/filter.c b/net/core/filter.c index b669e75d2b36..e5872704c28b 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1213,8 +1213,8 @@ static u64 bpf_skb_store_bytes(u64 r1, u64 r2, u64 r3, u64 r4, u64 flags) /* skb_store_bits cannot return -EFAULT here */ skb_store_bits(skb, offset, ptr, len); - if (BPF_RECOMPUTE_CSUM(flags) && skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_add(skb->csum, csum_partial(ptr, len, 0)); + if (BPF_RECOMPUTE_CSUM(flags)) + skb_postpush_rcsum(skb, ptr, len); return 0; }
similar to skb_postpull_rcsum() introduce skb_postpush_rcsum() helper Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> --- skb_postpush_rcsum() is also used in the next patch. include/linux/skbuff.h | 7 +++++++ net/core/filter.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)