diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2005-01-13 21:43:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2005-01-13 21:43:17 -0800 |
| commit | 62343f7629a612d82f0314777b17dff7807976dc (patch) | |
| tree | de61da72ad16fdd74d11401efe4f602e692d4073 /net | |
| parent | c749c9cc5bcfedc42f0b47c2ce4604e7fa2faf5a (diff) | |
| parent | c76178d6293fc6d894e5362001bb83d30bf4b54c (diff) | |
| download | history-62343f7629a612d82f0314777b17dff7807976dc.tar.gz | |
Merge bk://kernel.bkbits.net/acme/connection_sock-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
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 d9d201ca094852..eaf475a066c246 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; |