Moved the definitions of AF_CAN, PF_CAN, ARPHRD_CAN and ETH_P_CAN out of the

file can.h to make can.h fit for a kernel integration path.
Therefore i added the 'hack' to the Makefiles which now contain the missing
defines. Maybe there will be a better solution in the future (when CAN is
part of the kernel). But currently it helps to maintain sourcecode to be
copied right into the kernel source tree.
Additionally added address structures for isotp and bap in sockaddr_can.
Cleanups. Cosmetics.

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

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index 1690e18efa63e2777e8307b53dab5f88087acb52..19726ecc8d209971781c5859eef7e1ceca120ec6 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -34,7 +34,9 @@ else
 #CFLAGS                += -Idrivers/net -Inet
 
 ifneq ($(KBUILD_EXTMOD),)
-EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../include
+EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../include \
+               -DETH_P_CAN=0x000C \
+               -DARPHRD_CAN=804
 endif
 
 obj-$(CONFIG_CAN_VCAN)         += vcan.o

diff --git a/kernel/2.6/drivers/net/can/mscan/mscan.c b/kernel/2.6/drivers/net/can/mscan/mscan.c
index 94b173f784ed024a0d576f05c70d4b85622948fc..85288414a02dc88285e32f6940a577bfc4b7aefe 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mscan.c
+++ b/kernel/2.6/drivers/net/can/mscan/mscan.c
@@ -35,6 +35,8 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
 #include <linux/can.h>
 #include <linux/list.h>
 #include <asm/io.h>
@@ -659,11 +661,20 @@ struct can_device *alloc_mscandev()
   priv = can->priv;
 
   ndev->watchdog_timeo = MSCAN_WATCHDOG_TIMEOUT;
-  ndev->open                   = mscan_open;
-  ndev->stop                   = mscan_close;
+  ndev->open           = mscan_open;
+  ndev->stop           = mscan_close;
   ndev->hard_start_xmit        = mscan_hard_start_xmit;
   ndev->tx_timeout             = mscan_tx_timeout;
 
+  ndev->type           = ARPHRD_CAN;
+  ndev->hard_header_len        = 0;
+  ndev->mtu            = sizeof(struct can_frame);
+  ndev->addr_len       = 0;
+  ndev->tx_queue_len   = 10;
+
+  ndev->flags          = IFF_NOARP;
+  ndev->features       = NETIF_F_NO_CSUM;
+
   ndev->poll                   = mscan_rx_poll;
   ndev->weight                 = 8;
 

diff --git a/kernel/2.6/drivers/net/can/sja1000/Makefile b/kernel/2.6/drivers/net/can/sja1000/Makefile
index 8691287f3dd8ffcaf3684665f358fd664be8e0ba..fda4de10eb49da09987f304214bb8ed8621b8f0d 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/Makefile
+++ b/kernel/2.6/drivers/net/can/sja1000/Makefile
@@ -54,7 +54,9 @@ clean:
 else
 
 ifneq ($(KBUILD_EXTMOD),)
-EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../include
+EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../include \
+               -DETH_P_CAN=0x000C \
+               -DARPHRD_CAN=804
 endif
 
 obj-m := sja1000-isa.o sja1000-gw2.o sja1000-mem.o

diff --git a/kernel/2.6/drivers/net/can/sja1000/sja1000.c b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
index f984273db9863ac7fca634fb59c052f29deafa4c..ec6e295886df6baea8e4c3d9ed9ca778cc088fa5 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/sja1000.c
+++ b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
@@ -52,6 +52,8 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <asm/io.h>
 

diff --git a/kernel/2.6/drivers/net/can/slcan.c b/kernel/2.6/drivers/net/can/slcan.c
index 7fa98fee623f1d14d0caa92685b744ccfd88d357..5d2f08f1834b597b4a79bf5ed93f7f4f1e66e72e 100644 (file)
--- a/kernel/2.6/drivers/net/can/slcan.c
+++ b/kernel/2.6/drivers/net/can/slcan.c
@@ -71,6 +71,7 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_arp.h>
+#include <linux/if_ether.h>
 #include <linux/if_slip.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -110,6 +111,8 @@ module_param(debug, int, S_IRUGO);
  *
  * Increment NR_LDICS in include/linux/tty.h from 16 to 17
  *
+ * NEW: Since Kernel 2.6.21 you only have to change include/linux/tty.h
+ *
  */
 
 #define SLC_CHECK_TRANSMIT

diff --git a/kernel/2.6/drivers/net/can/vcan.c b/kernel/2.6/drivers/net/can/vcan.c
index 43df8caa1ac1dbc82d5d08079378e9750ec3171b..0862f6032e0893c1a8ffea350b81c799c4f66f88 100644 (file)
--- a/kernel/2.6/drivers/net/can/vcan.c
+++ b/kernel/2.6/drivers/net/can/vcan.c
@@ -47,6 +47,7 @@
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
+#include <linux/if_ether.h>
 
 #include <linux/can.h>
 #include <linux/can/version.h>

diff --git a/kernel/2.6/include/linux/can.h b/kernel/2.6/include/linux/can.h
index d555c01679eb2826311301025538db58cffef405..3d8608564e98f2ca6989537fb4347ce4dbae0993 100644 (file)
--- a/kernel/2.6/include/linux/can.h
+++ b/kernel/2.6/include/linux/can.h
@@ -21,24 +21,8 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 
-#include <linux/can/error.h>
-#include <linux/can/ioctl.h>
-
 /* controller area network (CAN) kernel definitions */
 
-/* CAN socket protocol family definition */
-#define PF_CAN         29      /* to be moved to include/linux/socket.h */
-#define AF_CAN         PF_CAN
-
-/* ethernet protocol identifier */
-#define ETH_P_CAN      0x000C  /* to be moved to include/linux/if_ether.h */
-
-/* ARP protocol identifier (dummy type for non ARP hardware) */
-#define ARPHRD_CAN     804     /* to be moved to include/linux/if_arp.h */
-
-
-
-
 /* special address description flags for the CAN_ID */
 #define CAN_EFF_FLAG 0x80000000U /* EFF/SFF is set in the MSB */
 #define CAN_RTR_FLAG 0x40000000U /* remote transmission request */
@@ -57,8 +41,6 @@ struct can_frame {
        __u8    data[8] __attribute__ ((aligned(8)));
 };
 
-
-
 /* particular protocols of the protocol family PF_CAN */
 #define CAN_RAW                1 /* RAW sockets */
 #define CAN_BCM                2 /* Broadcast Manager */
@@ -75,9 +57,11 @@ struct sockaddr_can {
        sa_family_t   can_family;
        int           can_ifindex;
        union {
-               struct { canid_t rx_id, tx_id; } tp16;
-               struct { canid_t rx_id, tx_id; } tp20;
-               struct { canid_t rx_id, tx_id; } mcnet;
+               struct { canid_t rx_id, tx_id;   } tp16;
+               struct { canid_t rx_id, tx_id;   } tp20;
+               struct { canid_t rx_id, tx_id;   } mcnet;
+               struct { canid_t rx_id, tx_id;   } isotp;
+               struct { int     sg_id, sg_type; } bap;
        } can_addr;
 };
 

diff --git a/kernel/2.6/net/can/Makefile b/kernel/2.6/net/can/Makefile
index d8fc709b24a7971b553c5c2aee9394ef8a6b236c..c3e74e89a9f79f4b8bafd68e8758b83784d01c3c 100644 (file)
--- a/kernel/2.6/net/can/Makefile
+++ b/kernel/2.6/net/can/Makefile
@@ -66,7 +66,11 @@ clean:
 else
 
 ifneq ($(KBUILD_EXTMOD),)
-EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../include
+EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../include \
+               -DETH_P_CAN=0x000C \
+               -DPF_CAN=29 \
+               -DAF_CAN=PF_CAN \
+               -DARPHRD_CAN=804
 endif
 
 obj-$(CONFIG_CAN)      += can.o