Merge: Correction for 2.6.23-git kernel - unregister_chrdev() does not return value.

[lincan.git] / lincan / utils / can-proxy.c

diff --git a/lincan/utils/can-proxy.c b/lincan/utils/can-proxy.c
index 99ca2e1c0ff1a460a5170437aff09969c24d9e47..d9dbcddf75744db94416d8fdc8caea8009486102 100644 (file)
--- a/lincan/utils/can-proxy.c
+++ b/lincan/utils/can-proxy.c
@@ -35,8 +35,6 @@ will forward packets from CAN to the most recent IP/UDP address.
 #define DEFAULT_CAN_CLIENT_PORT 3008
 #define MAX_MSG_SIZE 4000
 
-typedef struct canmsg_t canmsg_t;
-
 extern int SendCanMsg(canmsg_t * msg);
 extern int ReceiveCanMsg(canmsg_t * msg);
 extern int ReadInput(int fd);
@@ -153,7 +151,7 @@ int WriteNet(int fd, void * msg, int size) {
 int ReadNet(int fd, void * msg, int size) {
        char recvbuf[MAX_MSG_SIZE];
        int ret;
-       int recvaddrsize = sizeof(recvaddr);
+       unsigned int recvaddrsize = sizeof(recvaddr);
 
        // setting recvaddr is required for non-connected sockets
        memcpy(&recvaddr, &fromaddr, sizeof(recvaddr));
@@ -378,7 +376,6 @@ int ReceiveCanMsg(canmsg_t * msg) {
 
        msg->flags = 0;
        msg->cob = 0;
-       msg->timestamp = 0;
        ret = read(fdCanDev,msg, CAN_MSG_SIZE);
        if(ret == CAN_MSG_SIZE) {       
                LogMsg("RECV", fLog, msg);