diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2005-01-13 22:39:01 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2005-01-13 22:39:01 -0200 |
| commit | c76178d6293fc6d894e5362001bb83d30bf4b54c (patch) | |
| tree | 3c062cfe58765cd801f4107a1d9d2f79f6131219 /net | |
| parent | dfdae3a1fb466b4145e053460a99dcd13abe115d (diff) | |
| download | history-c76178d6293fc6d894e5362001bb83d30bf4b54c.tar.gz | |
[RAW] merge raw_sock with raw_opt
No need for two structs, follow the new inet_sock layout
style.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/raw.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index c6294ee6f42ef7..b14d5fec06df15 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -135,7 +135,7 @@ static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb) type = skb->h.icmph->type; if (type < 32) { - __u32 data = raw4_sk(sk)->filter.data; + __u32 data = raw_sk(sk)->filter.data; return ((1 << type) & data) != 0; } @@ -615,9 +615,10 @@ out: return err ? err : copied; static int raw_init(struct sock *sk) { - struct raw_opt *tp = raw4_sk(sk); + struct raw_sock *rp = raw_sk(sk); + if (inet_sk(sk)->num == IPPROTO_ICMP) - memset(&tp->filter, 0, sizeof(tp->filter)); + memset(&rp->filter, 0, sizeof(rp->filter)); return 0; } @@ -625,7 +626,7 @@ static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen) { if (optlen > sizeof(struct icmp_filter)) optlen = sizeof(struct icmp_filter); - if (copy_from_user(&raw4_sk(sk)->filter, optval, optlen)) + if (copy_from_user(&raw_sk(sk)->filter, optval, optlen)) return -EFAULT; return 0; } @@ -643,7 +644,7 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o len = sizeof(struct icmp_filter); ret = -EFAULT; if (put_user(len, optlen) || - copy_to_user(optval, &raw4_sk(sk)->filter, len)) + copy_to_user(optval, &raw_sk(sk)->filter, len)) goto out; ret = 0; out: return ret; |