diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-13 13:43:18 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:23 -0400 |
commit | 88c7664f13bd1a36acb8566b93892a4c58759ac6 (patch) | |
tree | 18ead610bf54ef87f3832c61d64a4bad30d4f78e /net/ipv4/raw.c | |
parent | 4bedb45203eab92a87b4c863fe2d0cded633427f (diff) |
[SK_BUFF]: Introduce icmp_hdr(), remove skb->h.icmph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/raw.c')
-rw-r--r-- | net/ipv4/raw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index ac57afa7c316..bf101dc1a972 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
@@ -132,7 +132,7 @@ static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb) | |||
132 | if (!pskb_may_pull(skb, sizeof(struct icmphdr))) | 132 | if (!pskb_may_pull(skb, sizeof(struct icmphdr))) |
133 | return 1; | 133 | return 1; |
134 | 134 | ||
135 | type = skb->h.icmph->type; | 135 | type = icmp_hdr(skb)->type; |
136 | if (type < 32) { | 136 | if (type < 32) { |
137 | __u32 data = raw_sk(sk)->filter.data; | 137 | __u32 data = raw_sk(sk)->filter.data; |
138 | 138 | ||
@@ -184,8 +184,8 @@ out: | |||
184 | void raw_err (struct sock *sk, struct sk_buff *skb, u32 info) | 184 | void raw_err (struct sock *sk, struct sk_buff *skb, u32 info) |
185 | { | 185 | { |
186 | struct inet_sock *inet = inet_sk(sk); | 186 | struct inet_sock *inet = inet_sk(sk); |
187 | int type = skb->h.icmph->type; | 187 | const int type = icmp_hdr(skb)->type; |
188 | int code = skb->h.icmph->code; | 188 | const int code = icmp_hdr(skb)->code; |
189 | int err = 0; | 189 | int err = 0; |
190 | int harderr = 0; | 190 | int harderr = 0; |
191 | 191 | ||