diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 23:50:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:59 -0400 |
| commit | d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc (patch) | |
| tree | 3b9073cecfbb3b6a1e25ab2b5dd2a22a43aef238 /net/dccp | |
| parent | bbe735e4247dba32568a305553b010081c8dea99 (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/dccp')
| -rw-r--r-- | net/dccp/ipv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 7f51e8db3967..627d0c3c51cf 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
| @@ -261,8 +261,8 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req, | |||
| 261 | 261 | ||
| 262 | if (rxopt->srcrt) | 262 | if (rxopt->srcrt) |
| 263 | opt = ipv6_invert_rthdr(sk, | 263 | opt = ipv6_invert_rthdr(sk, |
| 264 | (struct ipv6_rt_hdr *)(pktopts->nh.raw + | 264 | (struct ipv6_rt_hdr *)(skb_network_header(pktopts) + |
| 265 | rxopt->srcrt)); | 265 | rxopt->srcrt)); |
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | if (opt != NULL && opt->srcrt != NULL) { | 268 | if (opt != NULL && opt->srcrt != NULL) { |
| @@ -573,8 +573,8 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, | |||
| 573 | 573 | ||
| 574 | if (rxopt->srcrt) | 574 | if (rxopt->srcrt) |
| 575 | opt = ipv6_invert_rthdr(sk, | 575 | opt = ipv6_invert_rthdr(sk, |
| 576 | (struct ipv6_rt_hdr *)(ireq6->pktopts->nh.raw + | 576 | (struct ipv6_rt_hdr *)(skb_network_header(ireq6->pktopts) + |
| 577 | rxopt->srcrt)); | 577 | rxopt->srcrt)); |
| 578 | } | 578 | } |
| 579 | 579 | ||
| 580 | if (dst == NULL) { | 580 | if (dst == NULL) { |