diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-04 22:52:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-04 22:52:31 -0700 |
| commit | 00d115fc758c6ef331553a9c6aa34b7bd79116a5 (patch) | |
| tree | ca8567d5204c6b891dcf5d3e012ceb4a4f027c09 /include/net/gre.h | |
| parent | 6579867c8b02606e101a6c511c2511b027ed3f4a (diff) | |
| parent | 359a0ea9875ef4f32c8425bbe1ae348e1fd2ed2a (diff) | |
Merge branch 'inet_csums'
Tom Herbert says:
====================
net: Support checksum in UDP
This patch series adds support for using checksums in UDP tunnels. With
this it is possible that two or more checksums may be set within the
same packet and we would like to do that efficiently.
This series also creates some new helper functions to be used by various
tunnel protocol implementations.
v2: Fixed indentation in tcp_v6_send_check arguments.
v3: Move udp_set_csum and udp6_set_csum to be not inlined
Also have this functions call with a nocheck boolean argument
instead of passing a sock structure.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/gre.h')
| -rw-r--r-- | include/net/gre.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/gre.h b/include/net/gre.h index 70046a0b0b89..b53182018743 100644 --- a/include/net/gre.h +++ b/include/net/gre.h @@ -37,9 +37,10 @@ void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, int hdr_len); static inline struct sk_buff *gre_handle_offloads(struct sk_buff *skb, - bool gre_csum) + bool csum) { - return iptunnel_handle_offloads(skb, gre_csum, SKB_GSO_GRE); + return iptunnel_handle_offloads(skb, csum, + csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE); } |