net/atm: Cleanup dprint/ddprintk #defines and uses

[safe/jmp/linux-2.6] / net / atm / pvc.c

diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index f2c5417..437ee70 100644 (file)
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -3,7 +3,6 @@
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
 
-#include <linux/config.h>
 #include <linux/net.h>         /* struct socket, struct proto_ops */
 #include <linux/atm.h>         /* ATM stuff */
 #include <linux/atmdev.h>      /* ATM devices */
@@ -18,32 +17,35 @@
 #include "common.h"            /* common for PVCs and SVCs */
 
 
-static int pvc_shutdown(struct socket *sock,int how)
+static int pvc_shutdown(struct socket *sock, int how)
 {
        return 0;
 }
 
-
-static int pvc_bind(struct socket *sock,struct sockaddr *sockaddr,
-    int sockaddr_len)
+static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,
+                   int sockaddr_len)
 {
        struct sock *sk = sock->sk;
        struct sockaddr_atmpvc *addr;
        struct atm_vcc *vcc;
        int error;
 
-       if (sockaddr_len != sizeof(struct sockaddr_atmpvc)) return -EINVAL;
-       addr = (struct sockaddr_atmpvc *) sockaddr;
-       if (addr->sap_family != AF_ATMPVC) return -EAFNOSUPPORT;
+       if (sockaddr_len != sizeof(struct sockaddr_atmpvc))
+               return -EINVAL;
+       addr = (struct sockaddr_atmpvc *)sockaddr;
+       if (addr->sap_family != AF_ATMPVC)
+               return -EAFNOSUPPORT;
        lock_sock(sk);
        vcc = ATM_SD(sock);
        if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) {
                error = -EBADFD;
                goto out;
        }
-       if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) {
-               if (vcc->vpi != ATM_VPI_UNSPEC) addr->sap_addr.vpi = vcc->vpi;
-               if (vcc->vci != ATM_VCI_UNSPEC) addr->sap_addr.vci = vcc->vci;
+       if (test_bit(ATM_VF_PARTIAL, &vcc->flags)) {
+               if (vcc->vpi != ATM_VPI_UNSPEC)
+                       addr->sap_addr.vpi = vcc->vpi;
+               if (vcc->vci != ATM_VCI_UNSPEC)
+                       addr->sap_addr.vci = vcc->vci;
        }
        error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi,
                            addr->sap_addr.vci);
@@ -52,15 +54,14 @@ out:
        return error;
 }
 
-
-static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr,
-    int sockaddr_len,int flags)
+static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr,
+                      int sockaddr_len, int flags)
 {
-       return pvc_bind(sock,sockaddr,sockaddr_len);
+       return pvc_bind(sock, sockaddr, sockaddr_len);
 }
 
 static int pvc_setsockopt(struct socket *sock, int level, int optname,
-                         char __user *optval, int optlen)
+                         char __user *optval, unsigned int optlen)
 {
        struct sock *sk = sock->sk;
        int error;
@@ -71,9 +72,8 @@ static int pvc_setsockopt(struct socket *sock, int level, int optname,
        return error;
 }
 
-
 static int pvc_getsockopt(struct socket *sock, int level, int optname,
-                         char __user *optval, int __user *optlen)
+                         char __user *optval, int __user *optlen)
 {
        struct sock *sk = sock->sk;
        int error;
@@ -84,16 +84,16 @@ static int pvc_getsockopt(struct socket *sock, int level, int optname,
        return error;
 }
 
-
-static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
-    int *sockaddr_len,int peer)
+static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr,
+                      int *sockaddr_len, int peer)
 {
        struct sockaddr_atmpvc *addr;
        struct atm_vcc *vcc = ATM_SD(sock);
 
-       if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN;
-        *sockaddr_len = sizeof(struct sockaddr_atmpvc);
-       addr = (struct sockaddr_atmpvc *) sockaddr;
+       if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags))
+               return -ENOTCONN;
+       *sockaddr_len = sizeof(struct sockaddr_atmpvc);
+       addr = (struct sockaddr_atmpvc *)sockaddr;
        addr->sap_family = AF_ATMPVC;
        addr->sap_addr.itf = vcc->dev->number;
        addr->sap_addr.vpi = vcc->vpi;
@@ -101,7 +101,6 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
        return 0;
 }
 
-
 static const struct proto_ops pvc_proto_ops = {
        .family =       PF_ATMPVC,
        .owner =        THIS_MODULE,
@@ -114,6 +113,9 @@ static const struct proto_ops pvc_proto_ops = {
        .getname =      pvc_getname,
        .poll =         vcc_poll,
        .ioctl =        vcc_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl = vcc_compat_ioctl,
+#endif
        .listen =       sock_no_listen,
        .shutdown =     pvc_shutdown,
        .setsockopt =   pvc_setsockopt,
@@ -125,14 +127,17 @@ static const struct proto_ops pvc_proto_ops = {
 };
 
 
-static int pvc_create(struct socket *sock,int protocol)
+static int pvc_create(struct net *net, struct socket *sock, int protocol,
+                     int kern)
 {
+       if (net != &init_net)
+               return -EAFNOSUPPORT;
+
        sock->ops = &pvc_proto_ops;
-       return vcc_create(sock, protocol, PF_ATMPVC);
+       return vcc_create(net, sock, protocol, PF_ATMPVC);
 }
 
-
-static struct net_proto_family pvc_family_ops = {
+static const struct net_proto_family pvc_family_ops = {
        .family = PF_ATMPVC,
        .create = pvc_create,
        .owner = THIS_MODULE,