10 files changed, 65 insertions, 65 deletions

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index b37d894358ec..e62ba41b05c5 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -18,11 +18,11 @@
  *      X.25 002        Jonathan Naylor Centralised disconnect handling.
  *                                      New timer architecture.
  *      2000-03-11      Henner Eisen    MSG_EOR handling more POSIX compliant.
- *      2000-03-22      Daniela Squassoni Allowed disabling/enabling of 
- *                                        facilities negotiation and increased 
+ *      2000-03-22      Daniela Squassoni Allowed disabling/enabling of
+ *                                        facilities negotiation and increased
  *                                        the throughput upper limit.
  *      2000-08-27      Arnaldo C. Melo s/suser/capable/ + micro cleanups
- *      2000-09-04      Henner Eisen    Set sock->state in x25_accept(). 
+ *      2000-09-04      Henner Eisen    Set sock->state in x25_accept().
  *                                      Fixed x25_output() related skb leakage.
  *      2000-10-02      Henner Eisen    Made x25_kick() single threaded per socket.
  *      2000-10-27      Henner Eisen    MSG_DONTWAIT for fragment allocation.
@@ -256,8 +256,8 @@ static struct sock *x25_find_listener(struct x25_address *addr,
                          * call user data vs this sockets call user data
                          */
                         if(skb->len > 0 && x25_sk(s)->cudmatchlength > 0) {
-                                if((memcmp(x25_sk(s)->calluserdata.cuddata,
-                                        skb->data,
+                                if((memcmp(x25_sk(s)->calluserdata.cuddata,
+                                        skb->data,
                                         x25_sk(s)->cudmatchlength)) == 0) {
                                         sock_hold(s);
                                         goto found;
@@ -421,7 +421,7 @@ static int x25_getsockopt(struct socket *sock, int level, int optname,
 {
         struct sock *sk = sock->sk;
         int val, len, rc = -ENOPROTOOPT;
-        
+
         if (level != SOL_X25 || optname != X25_QBITINCL)
                 goto out;
 
@@ -434,7 +434,7 @@ static int x25_getsockopt(struct socket *sock, int level, int optname,
         rc = -EINVAL;
         if (len < 0)
                 goto out;
-                
+
         rc = -EFAULT;
         if (put_user(len, optlen))
                 goto out;
@@ -523,12 +523,12 @@ static int x25_create(struct socket *sock, int protocol)
         x25->facilities.pacsize_out = X25_DEFAULT_PACKET_SIZE;
         x25->facilities.throughput  = X25_DEFAULT_THROUGHPUT;
         x25->facilities.reverse     = X25_DEFAULT_REVERSE;
-        x25->dte_facilities.calling_len = 0;
-        x25->dte_facilities.called_len = 0;
-        memset(x25->dte_facilities.called_ae, '\0',
-                        sizeof(x25->dte_facilities.called_ae));
-        memset(x25->dte_facilities.calling_ae, '\0',
-                        sizeof(x25->dte_facilities.calling_ae));
+        x25->dte_facilities.calling_len = 0;
+        x25->dte_facilities.called_len = 0;
+        memset(x25->dte_facilities.called_ae, '\0',
+                        sizeof(x25->dte_facilities.called_ae));
+        memset(x25->dte_facilities.calling_ae, '\0',
+                        sizeof(x25->dte_facilities.calling_ae));
 
         rc = 0;
 out:
@@ -608,7 +608,7 @@ static int x25_release(struct socket *sock)
                         break;
         }
 
-        sock->sk        = NULL; 
+        sock->sk        = NULL;
         sk->sk_socket   = NULL; /* Not used, but we should do this */
 out:
         return 0;
@@ -635,7 +635,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 static int x25_wait_for_connection_establishment(struct sock *sk)
 {
         DECLARE_WAITQUEUE(wait, current);
-        int rc;
+        int rc;
 
         add_wait_queue_exclusive(sk->sk_sleep, &wait);
         for (;;) {
@@ -686,7 +686,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
         if (sk->sk_state == TCP_ESTABLISHED)
                 goto out;
 
-        sk->sk_state   = TCP_CLOSE;     
+        sk->sk_state   = TCP_CLOSE;
         sock->state = SS_UNCONNECTED;
 
         rc = -EINVAL;
@@ -778,7 +778,7 @@ static int x25_wait_for_data(struct sock *sk, long timeout)
         remove_wait_queue(sk->sk_sleep, &wait);
         return rc;
 }
-        
+
 static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
 {
         struct sock *sk = sock->sk;
@@ -837,7 +837,7 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
 
         return 0;
 }
- 
+
 int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
                         unsigned int lci)
 {
@@ -1120,7 +1120,7 @@ static int x25_sendmsg(struct kiocb *iocb, struct socket *sock,
         if (msg->msg_flags & MSG_OOB)
                 skb_queue_tail(&x25->interrupt_out_queue, skb);
         else {
-                len = x25_output(sk, skb);
+                len = x25_output(sk, skb);
                 if (len < 0)
                         kfree_skb(skb);
                 else if (x25->qbitincl)
@@ -1219,7 +1219,7 @@ static int x25_recvmsg(struct kiocb *iocb, struct socket *sock,
                 msg->msg_flags |= MSG_TRUNC;
         }
 
-        /* Currently, each datagram always contains a complete record */ 
+        /* Currently, each datagram always contains a complete record */
         msg->msg_flags |= MSG_EOR;
 
         rc = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
@@ -1277,8 +1277,8 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 case SIOCGSTAMP:
                         rc = -EINVAL;
                         if (sk)
-                                rc = sock_get_timestamp(sk, 
-                                                (struct timeval __user *)argp); 
+                                rc = sock_get_timestamp(sk,
+                                                (struct timeval __user *)argp);
                         break;
                 case SIOCGIFADDR:
                 case SIOCSIFADDR:
@@ -1346,17 +1346,17 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 }
 
                 case SIOCX25GDTEFACILITIES: {
-                        rc = copy_to_user(argp, &x25->dte_facilities,
+                        rc = copy_to_user(argp, &x25->dte_facilities,
                                                 sizeof(x25->dte_facilities));
                         if (rc)
                                 rc = -EFAULT;
-                        break;
-                }
+                        break;
+                }
 
-                case SIOCX25SDTEFACILITIES: {
-                        struct x25_dte_facilities dtefacs;
-                        rc = -EFAULT;
-                        if (copy_from_user(&dtefacs, argp, sizeof(dtefacs)))
+                case SIOCX25SDTEFACILITIES: {
+                        struct x25_dte_facilities dtefacs;
+                        rc = -EFAULT;
+                        if (copy_from_user(&dtefacs, argp, sizeof(dtefacs)))
                                 break;
                         rc = -EINVAL;
                         if (sk->sk_state != TCP_LISTEN &&
@@ -1414,7 +1414,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         if (copy_from_user(&sub_addr, argp,
                                         sizeof(sub_addr)))
                                 break;
-                        rc = -EINVAL;
+                        rc = -EINVAL;
                         if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN)
                                 break;
                         x25->cudmatchlength = sub_addr.cudmatchlength;
@@ -1443,7 +1443,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         break;
                 }
 
-                default:
+                default:
                         rc = -ENOIOCTLCMD;
                         break;
         }
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index 2b2e7fd689f3..5f631061c229 100644
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -18,7 +18,7 @@ static int max_timer[] = { 300 * HZ };
 static struct ctl_table_header *x25_table_header;
 
 static struct ctl_table x25_table[] = {
-        {
+        {
                 .ctl_name =     NET_X25_RESTART_REQUEST_TIMEOUT,
                 .procname =     "restart_request_timeout",
                 .data =         &sysctl_x25_restart_request_timeout,
@@ -29,7 +29,7 @@ static struct ctl_table x25_table[] = {
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
-        {
+        {
                 .ctl_name =     NET_X25_CALL_REQUEST_TIMEOUT,
                 .procname =     "call_request_timeout",
                 .data =         &sysctl_x25_call_request_timeout,
@@ -40,7 +40,7 @@ static struct ctl_table x25_table[] = {
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
-        {
+        {
                 .ctl_name =     NET_X25_RESET_REQUEST_TIMEOUT,
                 .procname =     "reset_request_timeout",
                 .data =         &sysctl_x25_reset_request_timeout,
@@ -51,7 +51,7 @@ static struct ctl_table x25_table[] = {
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
-        {
+        {
                 .ctl_name =     NET_X25_CLEAR_REQUEST_TIMEOUT,
                 .procname =     "clear_request_timeout",
                 .data =         &sysctl_x25_clear_request_timeout,
@@ -62,7 +62,7 @@ static struct ctl_table x25_table[] = {
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
-        {
+        {
                 .ctl_name =     NET_X25_ACK_HOLD_BACK_TIMEOUT,
                 .procname =     "acknowledgement_hold_back_timeout",
                 .data =         &sysctl_x25_ack_holdback_timeout,
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index f099fd6a7c0e..c7221de98a95 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -1,8 +1,8 @@
 /*
  *      X.25 Packet Layer release 002
  *
- *      This is ALPHA test software. This code may break your machine, randomly fail to work with new 
- *      releases, misbehave and/or generally screw up. It might even work. 
+ *      This is ALPHA test software. This code may break your machine, randomly fail to work with new
+ *      releases, misbehave and/or generally screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -31,7 +31,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
         unsigned int lci;
 
         frametype = skb->data[2];
-        lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF);
+        lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF);
 
         /*
          *      LCI of zero is always for us, and its always a link control
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c
index 27f5cc7966f6..dec404afa113 100644
--- a/net/x25/x25_facilities.c
+++ b/net/x25/x25_facilities.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -15,7 +15,7 @@
  *
  *      History
  *      X.25 001        Split from x25_subr.c
- *      mar/20/00       Daniela Squassoni Disabling/enabling of facilities 
+ *      mar/20/00       Daniela Squassoni Disabling/enabling of facilities
  *                                        negotiation.
  *      apr/14/05       Shaun Pereira - Allow fast select with no restriction
  *                                      on response.
@@ -125,8 +125,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
                         break;
                 case X25_FAC_CLASS_D:
                         switch (*p) {
-                        case X25_FAC_CALLING_AE:
-                                if (p[1] > X25_MAX_DTE_FACIL_LEN)
+                        case X25_FAC_CALLING_AE:
+                                if (p[1] > X25_MAX_DTE_FACIL_LEN)
                                         break;
                                 dte_facs->calling_len = p[2];
                                 memcpy(dte_facs->calling_ae, &p[3], p[1] - 1);
@@ -293,7 +293,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk,
 }
 
 /*
- *      Limit values of certain facilities according to the capability of the 
+ *      Limit values of certain facilities according to the capability of the
  *      currently attached x25 link.
  */
 void x25_limit_facilities(struct x25_facilities *facilities,
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index eed50e10f09b..c5239fcdefa0 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -17,7 +17,7 @@
  *      X.25 001        Jonathan Naylor   Started coding.
  *      X.25 002        Jonathan Naylor   Centralised disconnection code.
  *                                        New timer architecture.
- *      2000-03-20      Daniela Squassoni Disabling/enabling of facilities 
+ *      2000-03-20      Daniela Squassoni Disabling/enabling of facilities
  *                                        negotiation.
  *      2000-11-10      Henner Eisen      Check and reset for out-of-sequence
  *                                        i-frames.
@@ -67,7 +67,7 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
                         kfree_skb(skbo);
                 }
 
-                x25->fraglen = 0;               
+                x25->fraglen = 0;
         }
 
         skb_set_owner_r(skbn, sk);
@@ -167,7 +167,7 @@ static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyp
         int queued = 0;
         int modulus;
         struct x25_sock *x25 = x25_sk(sk);
-        
+
         modulus = (x25->neighbour->extended) ? X25_EMODULUS : X25_SMODULUS;
 
         switch (frametype) {
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 0a760fe66843..741ce95d4ad1 100644
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -16,7 +16,7 @@
  *      History
  *      X.25 001        Jonathan Naylor   Started coding.
  *      X.25 002        Jonathan Naylor   New timer architecture.
- *      mar/20/00       Daniela Squassoni Disabling/enabling of facilities 
+ *      mar/20/00       Daniela Squassoni Disabling/enabling of facilities
  *                                        negotiation.
  *      2000-09-04      Henner Eisen      dev_hold() / dev_put() for x25_neigh.
  */
@@ -94,7 +94,7 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,
                                skb->data[3], skb->data[4],
                                skb->data[5], skb->data[6]);
                         break;
-                        
+
                 default:
                         printk(KERN_WARNING "x25: received unknown %02X "
                                "with LCI 000\n", frametype);
diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c
index a2e62cea819a..6f5737853912 100644
--- a/net/x25/x25_out.c
+++ b/net/x25/x25_out.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -78,7 +78,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
                                                "sent\n", err, sent);
                                 return err;
                         }
-                                
+
                         skb_reserve(skbn, frontlen);
 
                         len = max_len > skb->len ? skb->len : max_len;
@@ -101,7 +101,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
                         skb_queue_tail(&sk->sk_write_queue, skbn);
                         sent += len;
                 }
-                
+
                 kfree_skb(skb);
         } else {
                 skb_queue_tail(&sk->sk_write_queue, skb);
@@ -110,7 +110,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
         return sent;
 }
 
-/* 
+/*
  *      This procedure is passed a buffer descriptor for an iframe. It builds
  *      the rest of the control part of the frame and then writes it out.
  */
@@ -131,7 +131,7 @@ static void x25_send_iframe(struct sock *sk, struct sk_buff *skb)
                 skb->data[2] |= (x25->vr << 5) & 0xE0;
         }
 
-        x25_transmit_link(skb, x25->neighbour); 
+        x25_transmit_link(skb, x25->neighbour);
 }
 
 void x25_kick(struct sock *sk)
diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index e0470bd8c2f9..3c9f1ba56221 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.4 with seq_file support
  *
@@ -62,7 +62,7 @@ static void *x25_seq_route_next(struct seq_file *seq, void *v, loff_t *pos)
         rt = v;
         if (rt->node.next != &x25_route_list)
                 rt = list_entry(rt->node.next, struct x25_route, node);
-        else 
+        else
                 rt = NULL;
 out:
         return rt;
@@ -88,7 +88,7 @@ static int x25_seq_route_show(struct seq_file *seq, void *v)
                    rt->dev ? rt->dev->name : "???");
 out:
         return 0;
-} 
+}
 
 static __inline__ struct sock *x25_get_socket_idx(loff_t pos)
 {
@@ -163,7 +163,7 @@ static int x25_seq_socket_show(struct seq_file *seq, void *v)
                    s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
 out:
         return 0;
-} 
+}
 
 static __inline__ struct x25_forward *x25_get_forward_idx(loff_t pos)
 {
diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 883a848bca5b..060fcfaa2f47 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 71ff3088f6fe..2af190dc5b01 100644
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -99,8 +99,8 @@ static void x25_heartbeat_expiry(unsigned long param)
 {
         struct sock *sk = (struct sock *)param;
 
-        bh_lock_sock(sk);
-        if (sock_owned_by_user(sk)) /* can currently only occur in state 3 */ 
+        bh_lock_sock(sk);
+        if (sock_owned_by_user(sk)) /* can currently only occur in state 3 */
                 goto restart_heartbeat;
 
         switch (x25_sk(sk)->state) {