diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-11 21:39:41 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:01 -0400 |
commit | c14d2450cb7fe1786e2ec325172baf66922bf597 (patch) | |
tree | 1186bfb1ed197e81a1ff816a513ad69503d5d786 /net/ipv4/tcp_input.c | |
parent | 878c814500b123dd61a5e211879a32e5fd932713 (diff) |
[SK_BUFF]: Introduce skb_set_network_header
For the cases where the network header is being set to a offset from skb->data.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 00190835cea1..5da823a32250 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -3634,7 +3634,8 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, | |||
3634 | return; | 3634 | return; |
3635 | 3635 | ||
3636 | skb_set_mac_header(nskb, skb_mac_header(skb) - skb->head); | 3636 | skb_set_mac_header(nskb, skb_mac_header(skb) - skb->head); |
3637 | nskb->nh.raw = nskb->data + (skb_network_header(skb) - skb->head); | 3637 | skb_set_network_header(nskb, |
3638 | skb_network_header(skb) - skb->head); | ||
3638 | nskb->h.raw = nskb->data + (skb->h.raw - skb->head); | 3639 | nskb->h.raw = nskb->data + (skb->h.raw - skb->head); |
3639 | 3640 | ||
3640 | skb_reserve(nskb, header); | 3641 | skb_reserve(nskb, header); |