aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-16 16:26:39 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:19 -0400
commitcfe1fc7759fdacb0c650b575daed1692bf3eaece (patch)
treeb8ed6fbc6c028595f5e82be1bccdeb2727e0a0b2 /net/ipv6/ip6_output.c
parentbff9b61ce330df04c6830d823c30c04203543f01 (diff)
[SK_BUFF]: Introduce skb_network_header_len
For the common sequence "skb->h.raw - skb->nh.raw", similar to skb->mac_len, that is precalculated tho, don't think we need to bloat skb with one more member, so just use this new helper, reducing the number of non-skbuff.h references to the layer headers even more. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 32e8c3f73c79..57a326080757 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1325,7 +1325,7 @@ int ip6_push_pending_frames(struct sock *sk)
1325 if (skb->data < skb_network_header(skb)) 1325 if (skb->data < skb_network_header(skb))
1326 __skb_pull(skb, skb_network_offset(skb)); 1326 __skb_pull(skb, skb_network_offset(skb));
1327 while ((tmp_skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) { 1327 while ((tmp_skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) {
1328 __skb_pull(tmp_skb, skb->h.raw - skb->nh.raw); 1328 __skb_pull(tmp_skb, skb_network_header_len(skb));
1329 *tail_skb = tmp_skb; 1329 *tail_skb = tmp_skb;
1330 tail_skb = &(tmp_skb->next); 1330 tail_skb = &(tmp_skb->next);
1331 skb->len += tmp_skb->len; 1331 skb->len += tmp_skb->len;
@@ -1337,7 +1337,7 @@ int ip6_push_pending_frames(struct sock *sk)
1337 } 1337 }
1338 1338
1339 ipv6_addr_copy(final_dst, &fl->fl6_dst); 1339 ipv6_addr_copy(final_dst, &fl->fl6_dst);
1340 __skb_pull(skb, skb->h.raw - skb->nh.raw); 1340 __skb_pull(skb, skb_network_header_len(skb));
1341 if (opt && opt->opt_flen) 1341 if (opt && opt->opt_flen)
1342 ipv6_push_frag_opts(skb, opt, &proto); 1342 ipv6_push_frag_opts(skb, opt, &proto);
1343 if (opt && opt->opt_nflen) 1343 if (opt && opt->opt_nflen)