diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-07-12 21:00:54 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-08-06 18:07:31 +0100 |
| commit | 3d4a1eea8aac05f347bbfbf41b9e2f8d6f116926 (patch) | |
| tree | 44d8bd0e33ddd0b2ba6babfc2cdb11b8782a2ab5 /include | |
| parent | 8bbfe822fbadf05ff84a057bde1e59c198e24aa0 (diff) | |
| download | kernel-common-3d4a1eea8aac05f347bbfbf41b9e2f8d6f116926.tar.gz kernel-common-3d4a1eea8aac05f347bbfbf41b9e2f8d6f116926.tar.bz2 kernel-common-3d4a1eea8aac05f347bbfbf41b9e2f8d6f116926.zip | |
Revert "net: ip, ipv6: handle gso skbs in forwarding path"
This reverts commit caa5344994778a2b4725b2d75c74430f76925e4a, which
was commit fe6cc55f3a9a053482a76f5a6b2257cee51b4663 upstream. In 3.2,
the transport header length is not calculated in the forwarding path,
so skb_gso_network_seglen() returns an incorrect result. We also have
problems due to the local_df flag not being set correctly.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 40c2726709b5..1b4ea29d3943 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2583,22 +2583,5 @@ static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size) return true; } - -/** - * skb_gso_network_seglen - Return length of individual segments of a gso packet - * - * @skb: GSO skb - * - * skb_gso_network_seglen is used to determine the real size of the - * individual segments, including Layer3 (IP, IPv6) and L4 headers (TCP/UDP). - * - * The MAC/L2 header is not accounted for. - */ -static inline unsigned int skb_gso_network_seglen(const struct sk_buff *skb) -{ - unsigned int hdr_len = skb_transport_header(skb) - - skb_network_header(skb); - return hdr_len + skb_gso_transport_seglen(skb); -} #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */ |