aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-10 23:50:43 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:59 -0400
commitd56f90a7c96da5187f0cdf07ee7434fe6aa78bbc (patch)
tree3b9073cecfbb3b6a1e25ab2b5dd2a22a43aef238 /net/ipv6/af_inet6.c
parentbbe735e4247dba32568a305553b010081c8dea99 (diff)
[SK_BUFF]: Introduce skb_network_header()
For the places where we need a pointer to the network header, it is still legal to touch skb->nh.raw directly if just adding to, subtracting from or setting it to another layer header. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r--net/ipv6/af_inet6.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 2ff070417955..7b917f856e1c 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -693,7 +693,8 @@ int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb)
693 if (np->rxopt.all) { 693 if (np->rxopt.all) {
694 if ((opt->hop && (np->rxopt.bits.hopopts || 694 if ((opt->hop && (np->rxopt.bits.hopopts ||
695 np->rxopt.bits.ohopopts)) || 695 np->rxopt.bits.ohopopts)) ||
696 ((IPV6_FLOWINFO_MASK & *(__be32*)skb->nh.raw) && 696 ((IPV6_FLOWINFO_MASK &
697 *(__be32 *)skb_network_header(skb)) &&
697 np->rxopt.bits.rxflow) || 698 np->rxopt.bits.rxflow) ||
698 (opt->srcrt && (np->rxopt.bits.srcrt || 699 (opt->srcrt && (np->rxopt.bits.srcrt ||
699 np->rxopt.bits.osrcrt)) || 700 np->rxopt.bits.osrcrt)) ||