2002-10-31 18:56:23

by Matthew Wilcox

Subject: [PATCH] update packet & wanpipe ioctl routines

Convert af_packet.c and af_wanpipe.c to call dev_ioctl by default. I'm
less than convinced these protocols should be calling inet_ioctl, but I'm
not going to change that behaviour.

diff -urpNX dontdiff linux-2.5.45/net/packet/af_packet.c linux-2.5.45-willy/net/packet/af_packet.c
--- linux-2.5.45/net/packet/af_packet.c 2002-10-31 10:28:10.000000000 -0500
+++ linux-2.5.45-willy/net/packet/af_packet.c 2002-10-29 17:25:30.000000000 -0500
@@ -1432,8 +1432,7 @@ static int packet_ioctl(struct socket *s
{
struct sock *sk = sock->sk;

- switch(cmd)
- {
+ switch(cmd) {
case SIOCOUTQ:
{
int amount = atomic_read(&sk->wmem_alloc);
@@ -1452,35 +1451,12 @@ static int packet_ioctl(struct socket *s
return put_user(amount, (int *)arg);
}
case SIOCGSTAMP:
- if(sk->stamp.tv_sec==0)
+ if (sk->stamp.tv_sec==0)
return -ENOENT;
if (copy_to_user((void *)arg, &sk->stamp,
sizeof(struct timeval)))
return -EFAULT;
break;
- case SIOCGIFFLAGS:
-#ifndef CONFIG_INET
- case SIOCSIFFLAGS:
-#endif
- case SIOCGIFCONF:
- case SIOCGIFMETRIC:
- case SIOCSIFMETRIC:
- case SIOCGIFMEM:
- case SIOCSIFMEM:
- case SIOCGIFMTU:
- case SIOCSIFMTU:
- case SIOCSIFLINK:
- case SIOCGIFHWADDR:
- case SIOCSIFHWADDR:
- case SIOCSIFMAP:
- case SIOCGIFMAP:
- case SIOCSIFSLAVE:
- case SIOCGIFSLAVE:
- case SIOCGIFINDEX:
- case SIOCGIFNAME:
- case SIOCGIFCOUNT:
- case SIOCSIFHWBROADCAST:
- return(dev_ioctl(cmd,(void *) arg));

#ifdef CONFIG_INET
case SIOCADDRT:
@@ -1501,7 +1477,7 @@ static int packet_ioctl(struct socket *s
#endif

default:
- return -EOPNOTSUPP;
+ return dev_ioctl(cmd, (void *)arg);
}
return 0;
}
diff -urpNX dontdiff linux-2.5.45/net/wanrouter/af_wanpipe.c linux-2.5.45-willy/net/wanrouter/af_wanpipe.c
--- linux-2.5.45/net/wanrouter/af_wanpipe.c 2002-10-31 10:28:10.000000000 -0500
+++ linux-2.5.45-willy/net/wanrouter/af_wanpipe.c 2002-10-29 16:34:36.000000000 -0500
@@ -1922,30 +1922,6 @@ static int wanpipe_ioctl(struct socket *
sock->file->f_flags |= O_NONBLOCK;
return 0;

- case SIOCGIFFLAGS:
-#ifndef CONFIG_INET
- case SIOCSIFFLAGS:
-#endif
- case SIOCGIFCONF:
- case SIOCGIFMETRIC:
- case SIOCSIFMETRIC:
- case SIOCGIFMEM:
- case SIOCSIFMEM:
- case SIOCGIFMTU:
- case SIOCSIFMTU:
- case SIOCSIFLINK:
- case SIOCGIFHWADDR:
- case SIOCSIFHWADDR:
- case SIOCSIFMAP:
- case SIOCGIFMAP:
- case SIOCSIFSLAVE:
- case SIOCGIFSLAVE:
- case SIOCGIFINDEX:
- case SIOCGIFNAME:
- case SIOCGIFCOUNT:
- case SIOCSIFHWBROADCAST:
- return(dev_ioctl(cmd,(void *) arg));
-
#ifdef CONFIG_INET
case SIOCADDRT:
case SIOCDELRT:
@@ -1968,7 +1944,7 @@ static int wanpipe_ioctl(struct socket *
#endif

default:
- return -EOPNOTSUPP;
+ return dev_ioctl(cmd,(void *) arg);
}
/*NOTREACHED*/
}

--
Revolutions do not require corporate support.

2002-10-31 19:37:25

by Gabor MICSKO

Subject: kernel.org is down?

Hi!

What's the matter with kernel.org (http,ftp)?

Cheers


-----------------------------------
Gabor Micsko
Compaq Accredited Platform Specialist, System Engineer (APS, ASE)
Szint?zis Computer Rendszerh?z Kft.
H-9021 Gyor, Tihanyi ?rp?d ?t. 2.
Tel: +36-96-502-216
Fax: +36-96-318-658
E-mail: [email protected]

2002-10-31 20:02:41

by Kasper Dupont

Subject: Re: kernel.org is down?

Gabor MICSKO wrote:
>
> Hi!
>
> What's the matter with kernel.org (http,ftp)?

There was an anouncment about that on http://kernel.org/
hardware maintainance IIRC.

--
Kasper Dupont -- der bruger for meget tid p? usenet.
For sending spam use mailto:[email protected]
Don't do this at home kids: touch -- -rf

2002-11-02 10:28:04

by David Miller

Subject: Re: [PATCH] update packet & wanpipe ioctl routines

Patch applied, thanks.