Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / net / ipv4 / tcp_output.c

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 979520e46e33c16ba2237cb36ef7b4dab94f6546..5c46bc4c7e8d26397c304c9dc69d9e559cd72337 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1403,7 +1403,7 @@ static int __pskb_trim_head(struct sk_buff *skb, int len)
                } else {
                        shinfo->frags[k] = shinfo->frags[i];
                        if (eat) {
-                               shinfo->frags[k].page_offset += eat;
+                               skb_frag_off_add(&shinfo->frags[k], eat);
                                skb_frag_size_sub(&shinfo->frags[k], eat);
                                eat = 0;
                        }