aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/ipv6.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 17:57:15 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:54 -0400
commit1ced98e81d1c2f1ce965ecf8d0032e02ffa07bf0 (patch)
tree135955ffd557808f97aeb126efde39f8eeaeefbf /net/sctp/ipv6.c
parent8856dfa3e9b71ac2177016f66ace3a8978afecc1 (diff)
[SK_BUFF] ipv6: More skb_reset_network_header conversions related to skb_pull
Now related to this form: skb->nh.ipv6h = (struct ipv6hdr *)skb_put(skb, length); That, as the others, is done when skb->tail is still equal to skb->data, making the conversion to skb_reset_network_header possible. Also one more case equivalent to skb->nh.raw = skb->data, of this form: iph = (struct ipv6hdr *)skb->data; <SNIP> skb->nh.ipv6h = iph; Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ipv6.c')
-rw-r--r--net/sctp/ipv6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 0b9c49b3a100..5f9b145b0b90 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -122,7 +122,6 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
122 int type, int code, int offset, __be32 info) 122 int type, int code, int offset, __be32 info)
123{ 123{
124 struct inet6_dev *idev; 124 struct inet6_dev *idev;
125 struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;
126 struct sctphdr *sh = (struct sctphdr *)(skb->data + offset); 125 struct sctphdr *sh = (struct sctphdr *)(skb->data + offset);
127 struct sock *sk; 126 struct sock *sk;
128 struct sctp_association *asoc; 127 struct sctp_association *asoc;
@@ -136,7 +135,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
136 /* Fix up skb to look at the embedded net header. */ 135 /* Fix up skb to look at the embedded net header. */
137 saveip = skb->nh.raw; 136 saveip = skb->nh.raw;
138 savesctp = skb->h.raw; 137 savesctp = skb->h.raw;
139 skb->nh.ipv6h = iph; 138 skb_reset_network_header(skb);
140 skb->h.raw = (char *)sh; 139 skb->h.raw = (char *)sh;
141 sk = sctp_err_lookup(AF_INET6, skb, sh, &asoc, &transport); 140 sk = sctp_err_lookup(AF_INET6, skb, sh, &asoc, &transport);
142 /* Put back, the original pointers. */ 141 /* Put back, the original pointers. */