The new mkpatch script removes the trailing blank lines after a

#if LINUX_VERSION_CODE ...
Added some blank lines to get a better linespacing in the (patched) code.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@221 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/slcan.c b/kernel/2.6/drivers/net/can/slcan.c
index 7eb6ed2abf89de1e12dce7f965502fb81002a9d2..d96df0185130feeb095e44eade718b2bcd408887 100644 (file)
--- a/kernel/2.6/drivers/net/can/slcan.c
+++ b/kernel/2.6/drivers/net/can/slcan.c
@@ -506,6 +506,7 @@ static int slcan_receive_room(struct tty_struct *tty)
        return 65536;  /* We can handle an infinite amount of data. :-) */
 }
 #endif
+
 /*
  * Handle the 'receiver data ready' interrupt.
  * This function is called by the 'tty_io' module in the kernel when
@@ -711,6 +712,7 @@ static int slcan_open(struct tty_struct *tty)
        if (tty->driver->flush_buffer)
                tty->driver->flush_buffer(tty);
 #endif
+
        if (!test_bit(SLF_INUSE, &sl->flags)) {
                /* Perform the low-level SLCAN initialization. */
                sl->rcount   = 0;
@@ -724,9 +726,11 @@ static int slcan_open(struct tty_struct *tty)
 
        /* Done.  We have linked the TTY line to a channel. */
        rtnl_unlock();
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
        tty->receive_room = 65536;      /* We don't flow control */
 #endif
+
        return sl->dev->base_addr;
 
 err_free_chan:

diff --git a/kernel/2.6/drivers/net/can/vcan.c b/kernel/2.6/drivers/net/can/vcan.c
index 5021a0efb237561c7c74e9ca4bdea60b4cbf1029..42d5e28a83758cd3e93ffcc04966f016267ed132 100644 (file)
--- a/kernel/2.6/drivers/net/can/vcan.c
+++ b/kernel/2.6/drivers/net/can/vcan.c
@@ -74,6 +74,7 @@ module_param(debug, int, S_IRUGO);
 #define DBG_FRAME(args...)
 #define DBG_SKB(skb)
 #endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 static void *kzalloc(size_t size, unsigned int __nocast flags)
 {

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index e07f39beae8ddbac90c357de5dfd1baaa1a27cef..d30dcd3afa666d6e8d61971df37ff37413bf7919 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -160,6 +160,7 @@ static struct can_proto *proto_tab[CAN_NPROTO];
 extern struct timer_list stattimer; /* timer for statistics update */
 extern struct s_stats  stats;       /* packet statistics */
 extern struct s_pstats pstats;      /* receive list statistics */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 static void *kzalloc(size_t size, unsigned int __nocast flags)
 {
@@ -274,6 +275,7 @@ int can_proto_register(struct can_proto *cp)
        if (err < 0)
                return err;
 #endif
+
        proto_tab[proto] = cp;
 
        /* use generic ioctl function if the module doesn't bring its own */
@@ -454,6 +456,7 @@ static int can_create(struct socket *sock, int protocol)
        }
        sk_set_owner(sk, proto_tab[protocol]->owner);
 #endif
+
        sock_init_data(sock, sk);
        sk->sk_destruct = can_sock_destruct;
 
@@ -462,9 +465,11 @@ static int can_create(struct socket *sock, int protocol)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
        if (sk->sk_prot->init)
                ret = sk->sk_prot->init(sk);
+
 #else
        if (cp->init)
                ret = cp->init(sk);
+
 #endif
 
        if (ret) {

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index c9347a2354c1a0e4296286e854a5eea74bf7dbe3..68c99be0a271575265fc0a9dae8f6485ebf2a19f 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -229,6 +229,7 @@ static struct can_proto bcm_can_proto = {
        .init       = bcm_init,
 };
 #endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 static void *kzalloc(size_t size, unsigned int __nocast flags)
 {