Reorder #include directives.

Remove superfluous braces.

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

diff --git a/kernel/2.6/drivers/net/can/vcan.c b/kernel/2.6/drivers/net/can/vcan.c
index 5c455ad7e7524752c4c43d9dd8e7bc1575ac681d..87f56d9f57059dba55572c48bb675ed509eb779e 100644 (file)
--- a/kernel/2.6/drivers/net/can/vcan.c
+++ b/kernel/2.6/drivers/net/can/vcan.c
@@ -47,7 +47,6 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
-
 #include <linux/can.h>
 
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */
@@ -178,9 +177,8 @@ static int vcan_tx(struct sk_buff *skb, struct net_device *dev)
                            "using new skbuff %p\n",
                            dev->name, __FUNCTION__, old_skb, skb);
                        kfree_skb(old_skb);
-                       if (!skb) {
+                       if (!skb)
                                return 0;
-                       }
                } else
                        skb_orphan(skb);
 

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index 6cd6850314e1368e8c506784232e668841d4e217..1e80776d33b0630ef74414df36bc51a7cf279257 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -57,11 +57,11 @@
 #include <linux/skbuff.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
+#include <linux/can.h>
+#include <linux/can/core.h>
 #include <net/sock.h>
 #include <asm/uaccess.h>
 
-#include <linux/can.h>
-#include <linux/can/core.h>
 #include "af_can.h"
 
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */

diff --git a/kernel/2.6/net/can/af_can.h b/kernel/2.6/net/can/af_can.h
index cd9157bb6b3374f8d75ece5a2f369b138ef12716..c34e8bfe0bb9655ca1c554789855b93d1863dc59 100644 (file)
--- a/kernel/2.6/net/can/af_can.h
+++ b/kernel/2.6/net/can/af_can.h
@@ -49,7 +49,6 @@
 #include <linux/netdevice.h>
 #include <linux/list.h>
 #include <linux/rcupdate.h>
-
 #include <linux/can.h>
 
 /* af_can rx dispatcher structures */

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index 9df6f761e2cec22cdcb67924c498e67aa2f4f652..7385f7124806884bee05221f8de5e59c42419c9a 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -48,11 +48,10 @@
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/poll.h>
-#include <net/sock.h>
-
 #include <linux/can.h>
 #include <linux/can/core.h>
 #include <linux/can/bcm.h>
+#include <net/sock.h>
 
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */
 RCSID("$Id$");

diff --git a/kernel/2.6/net/can/dev.c b/kernel/2.6/net/can/dev.c
index a81b3b68ec36e2089f6b370eb39bd76315d4cbbc..7a0020a11d46f46d13ecc6a7cd534264e190a9a4 100644 (file)
--- a/kernel/2.6/net/can/dev.c
+++ b/kernel/2.6/net/can/dev.c
@@ -21,7 +21,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
-
 #include <linux/can.h>
 #include <linux/can/dev.h>
 

diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c
index 75ff8a40360f96061d80bd979d8bb9b46e82ac25..c8676d23558779b7cd8c1668b3eb1cccb8466578 100644 (file)
--- a/kernel/2.6/net/can/proc.c
+++ b/kernel/2.6/net/can/proc.c
@@ -46,8 +46,8 @@
 #include <linux/proc_fs.h>
 #include <linux/list.h>
 #include <linux/rcupdate.h>
-
 #include <linux/can/core.h>
+
 #include "af_can.h"
 
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */

diff --git a/kernel/2.6/net/can/raw.c b/kernel/2.6/net/can/raw.c
index 5361b5c6d945cebea2719accb3b98c7ce1d057f8..f6ba7ca4b8689770c9430d0fb1fc7eba91b874d0 100644 (file)
--- a/kernel/2.6/net/can/raw.c
+++ b/kernel/2.6/net/can/raw.c
@@ -49,11 +49,10 @@
 #include <linux/netdevice.h>
 #include <linux/uio.h>
 #include <linux/poll.h>
-#include <net/sock.h>
-
 #include <linux/can.h>
 #include <linux/can/core.h>
 #include <linux/can/raw.h>
+#include <net/sock.h>
 
 #include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */
 RCSID("$Id$");