]> rtime.felk.cvut.cz Git - can-eth-gw.git/commitdiff
source code formatted to comply with Linux code style
authorRadek Matejka <radek.matejka@gmail.com>
Thu, 16 Aug 2012 13:07:00 +0000 (15:07 +0200)
committerRadek Matejka <radek.matejka@gmail.com>
Thu, 16 Aug 2012 13:07:00 +0000 (15:07 +0200)
kernel/Makefile
kernel/canethgw.c

index b9ba2f5e4bb7be46b9fbad1443c164b54c26a97f..4591ba0af9da3da7fccab3ccb9c975e80b1f15c1 100644 (file)
@@ -6,7 +6,4 @@ install:
        make -C /usr/src/linux/_build_qemu M=`pwd` modules_install
 clean:
        make -C /usr/src/linux/_build_qemu M=`pwd` clean
-test:
-       modprobe -r canethgw
-       modprobe canethgw
 
index 1b4bb439e7be0e16b72ff34cff4196ff0bdf46f5..27f752516a41f7c8db854f5a58e78a2d05193ae6 100644 (file)
@@ -1,4 +1,4 @@
-#define DEBUG 1
+#define DEBUG
 
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <net/inet_common.h>
 
-MODULE_LICENSE( "GPL" );
+MODULE_LICENSE("GPL");
 
-static int  cegw_udp_can( void* data );
-inline static void cegw_udp_send( struct socket* udp_sock, struct can_frame* cf, struct in_addr ipaddr, u16 port );
-static int  cegw_can_udp( void* data );
-inline static void cegw_can_send( struct socket* can_sock, struct can_frame* cf, int ifindex );
-static int cegw_thread_start( void* data );
-static int cegw_thread_stop( void );
+static int  cegw_udp_can(void *data);
+static void cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
+               struct in_addr ipaddr, u16 port);
+static int  cegw_can_udp(void *data);
+static void cegw_can_send(struct socket *can_sock, struct can_frame *cf,
+               int ifindex);
+static int cegw_thread_start(void *data);
+static int cegw_thread_stop(void);
 
 enum __cegw_state
 {
@@ -51,62 +53,65 @@ struct cegw_setting
 };
 
 static int cegw_state = CEGW_STOP;
-static struct socket* can_sock = NULL, * udp_sock = NULL;
-static struct task_struct* eth_to_can = NULL, * can_to_eth = NULL;
+static struct socket *can_sock = NULL, *udp_sock = NULL;
+static struct task_struct *eth_to_can = NULL, *can_to_eth = NULL;
 static struct notifier_block notifier;
 
-HLIST_HEAD( cegw_rule_can_eth );
-HLIST_HEAD( cegw_rule_eth_can );
-DEFINE_MUTEX( cegw_mutex );
+HLIST_HEAD(rule_can_eth);
+HLIST_HEAD(rule_eth_can);
+DEFINE_MUTEX(cegw_mutex);
 
-inline static void cegw_udp_send( struct socket* udp_sock, struct can_frame* cf, struct in_addr ipaddr, u16 port )
+static void cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
+               struct in_addr ipaddr, u16 port)
 {
        struct msghdr mh;
        struct sockaddr_in addr;
        struct kvec vec;
-       
+
        addr.sin_family = AF_INET;
-       addr.sin_port = htons( port );
+       addr.sin_port = htons(port);
        addr.sin_addr = ipaddr;
-       
+
        mh.msg_name = &addr;
-       mh.msg_namelen = sizeof( addr );
+       mh.msg_namelen = sizeof(addr);
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
-       
+
        vec.iov_base = cf;
-       vec.iov_len = sizeof( *cf );
-       
-       kernel_sendmsg( udp_sock, &mh, &vec, 1, sizeof( *cf ) );
+       vec.iov_len = sizeof(*cf);
+
+       kernel_sendmsg(udp_sock, &mh, &vec, 1, sizeof(*cf));
 }
 
-inline static void cegw_can_send( struct socket* can_sock, struct can_frame* cf, int ifindex )
+static void cegw_can_send(struct socket* can_sock, struct can_frame* cf,
+               int ifindex)
 {
        struct msghdr mh;
        struct kvec vec;
        struct sockaddr_can addr;
-       
+
        addr.can_family = AF_CAN;
        addr.can_ifindex = ifindex;
-       
+
        mh.msg_name = &addr;
-       mh.msg_namelen = sizeof( addr );
+       mh.msg_namelen = sizeof(addr);
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
-       
+
        vec.iov_base = cf;
-       vec.iov_len = sizeof( *cf );
-       
-       kernel_sendmsg( can_sock, &mh, &vec, 1, sizeof( *cf ) );
+       vec.iov_len = sizeof(*cf);
+
+       kernel_sendmsg(can_sock, &mh, &vec, 1, sizeof(*cf));
 }
 
-/** 
+/**
  * cegw_udp_can - performs udp->can routing
+ *
  * This function is run as a thread.
  */
-static int cegw_udp_can( void* data )
+static int cegw_udp_can(void *data)
 {
        struct can_frame cf;
        struct kvec vec;
@@ -124,29 +129,25 @@ static int cegw_udp_can( void* data )
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
 
-       while( 1 )
-       {
-               if( cegw_state == CEGW_STOP )
+       while (1) {
+               if (cegw_state == CEGW_STOP)
                        break;
                vec.iov_base = &cf;
                vec.iov_len = sizeof(cf);
-               recv_size = kernel_recvmsg( udp_sock, &mh, &vec, 1, sizeof(cf), 0 );
+               recv_size = kernel_recvmsg(udp_sock, &mh, &vec, 1, 
+                               sizeof(cf), 0);
                /* recv_size == 0 when shutting down */
-               if( recv_size != sizeof(cf) || recv_size == 0 )
-               {
+               if (recv_size != sizeof(cf) || recv_size == 0)
                        continue;
-               } else if( recv_size < 0 )
-               {
+               else if (recv_size < 0)
                        return -1;
-               }
 
-               hlist_for_each_entry_rcu( rule, pos, &cegw_rule_eth_can, list )
-               {
+               hlist_for_each_entry_rcu(rule, pos, &rule_eth_can, list) {
                        rcu_read_lock();
                        can_ifidx = rule->can_ifindex;
                        rcu_read_unlock();
                        /* ToDo: from filter */
-                       cegw_can_send( can_sock, &cf, can_ifidx );
+                       cegw_can_send(can_sock, &cf, can_ifidx);
                }
        }
 
@@ -156,7 +157,7 @@ static int cegw_udp_can( void* data )
 /**
  * cegw_can_udp - performs can->udp routing
  */
-static int cegw_can_udp( void* data )
+static int cegw_can_udp(void* data)
 {
        struct msghdr mh;
        struct kvec vec;
@@ -169,42 +170,38 @@ static int cegw_can_udp( void* data )
        int recv_size;
 
        mh.msg_name = &ca;
-       mh.msg_namelen = sizeof( ca );
+       mh.msg_namelen = sizeof(ca);
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
 
-       while( 1 )
-       {
-               if( cegw_state == CEGW_STOP )
+       while (1) {
+               if (cegw_state == CEGW_STOP)
                        break;
                vec.iov_base = &cf;
-               vec.iov_len = sizeof( cf );
+               vec.iov_len = sizeof(cf);
 
-               recv_size = kernel_recvmsg( can_sock, &mh, &vec, 1, sizeof( cf ), 0 );
-               if( recv_size != sizeof(cf) || recv_size == 0 )
-               {
+               recv_size = kernel_recvmsg(can_sock, &mh, &vec, 1,
+                                          sizeof(cf), 0);
+               if (recv_size != sizeof(cf) || recv_size == 0)
                        continue;
-               } else if( recv_size < 0 )
-               {
+               else if (recv_size < 0)
                        return -1;
-               }
 
-               hlist_for_each_entry_rcu( rule, pos, &cegw_rule_can_eth, list )
-               {
+               hlist_for_each_entry_rcu(rule, pos, &rule_can_eth, list) {
                        rcu_read_lock();
                        eth_ip = rule->eth_ip;
                        eth_port = rule->eth_port;
                        rcu_read_unlock();
-                       if( rule->can_ifindex == ca.can_ifindex )
-                               cegw_udp_send( udp_sock, &cf, eth_ip, eth_port );
+                       if (rule->can_ifindex == ca.can_ifindex)
+                               cegw_udp_send(udp_sock, &cf, eth_ip, eth_port);
                }
        }
-       
+
        return 0;
 }
 
-static int cegw_newroute( struct sk_buff* skb, struct nlmsghdr* nlh, void* arg )
+static int cegw_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
        struct nlattr* tb[ CEGW_MAX+1 ];
        struct cegw_rule* rule = NULL;
@@ -214,142 +211,136 @@ static int cegw_newroute( struct sk_buff* skb, struct nlmsghdr* nlh, void* arg )
        unsigned short port;
        struct cegw_setting* set;
        int err = 0;
-       
-       if( nlmsg_len(nlh) < sizeof(*r) )
+
+       if (nlmsg_len(nlh) < sizeof(*r))
                return -EINVAL;
 
-       r = nlmsg_data( nlh );
+       r = nlmsg_data(nlh);
 
-       if( r->rtm_family != AF_CAN )
+       if (r->rtm_family != AF_CAN)
                return -EPFNOSUPPORT;
 
-       err = nlmsg_parse( nlh, sizeof(*r), tb, CEGW_MAX, NULL );
-       if( err < 0 )
-       {
-               pr_devel( "canethgw: nlmsg_parse error\n" );
+       err = nlmsg_parse(nlh, sizeof(*r), tb, CEGW_MAX, NULL);
+       if (err < 0) {
+               pr_devel("canethgw: nlmsg_parse error\n");
                return err;
        }
 
-       if( tb[CEGW_CMD_INFO] == NULL )
-       {
-               pr_devel( "canethgw: CEGW_CMD_INFO is missing in rtmsg\n" );
+       if (tb[CEGW_CMD_INFO] == NULL) {
+               pr_devel("canethgw: CEGW_CMD_INFO is missing in rtmsg\n");
                return -EINVAL;
        }
 
-       switch( *(int*)nla_data( tb[CEGW_CMD_INFO] ) )
-       {
-               case CEGW_LISTEN:
-                       if( !tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] )
-                       {
-                               pr_devel( "canethgw: missing attribute for CEGW_LISTEN\n" );
-                               return -EINVAL;
-                       }
-
-                       /* ToDo: valid listen address */
-                       set = kmalloc( sizeof(*set), GFP_KERNEL );
-                       set->eth_ip   = *(struct in_addr*)nla_data( tb[CEGW_ETH_IP] );
-                       set->eth_port = *(unsigned short*)nla_data( tb[CEGW_ETH_PORT] );
-                       kthread_run( cegw_thread_start, set, "canethgw" );
-                       break;
-               case CEGW_RULE_CAN_ETH:
-                       if( !tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] || !tb[CEGW_CAN_IFINDEX] )
-                       {
-                               pr_devel( "canethgw: missing attribute for CEGW_RULE_CAN_ETH\n" );
-                               return -EINVAL;
-                       }
-
-                       ifindex = *(int*)nla_data( tb[CEGW_CAN_IFINDEX] );
-                       ip = *(struct in_addr*)nla_data( tb[CEGW_ETH_IP] );
-                       port = *(unsigned short*)nla_data( tb[CEGW_ETH_PORT] );
-                       pr_devel( "canethgw: new can->eth rule - (%d)->(%x:%hu)\n", ifindex, ip.s_addr, port );
-
-                       rule = kmalloc( sizeof(struct cegw_rule), GFP_KERNEL );
-                       if( rule == NULL )
-                       {
-                               break;
-                       }
-                       
-                       rule->can_ifindex = ifindex;
-                       rule->eth_ip = ip;
-                       rule->eth_port = port;
-                       
-                       hlist_add_head_rcu( &rule->list, &cegw_rule_can_eth );
-                       break;
-               case CEGW_RULE_ETH_CAN:
-                       if( !tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] || !tb[CEGW_CAN_IFINDEX] )
-                       {
-                               pr_devel( "canethgw: missing attribute for CEGW_RULE_ETH_CAN\n" );
-                               return -EINVAL;
-                       }
-
-                       ifindex = *(int*)nla_data( tb[CEGW_CAN_IFINDEX] );
-                       ip = *(struct in_addr*)nla_data( tb[CEGW_ETH_IP] );
-                       port = *(unsigned short*)nla_data( tb[CEGW_ETH_PORT] );
-                       pr_devel( "canethgw: new eth->can rule - (%x:%hu)->(%d)\n", ip.s_addr, port, ifindex );
+       switch (*(int*)nla_data(tb[CEGW_CMD_INFO])) {
+       case CEGW_LISTEN:
+               if (!tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT]) {
+                       pr_devel("canethgw: missing attribute for CEGW_LISTEN\n");
+                       return -EINVAL;
+               }
 
-                       rule = kmalloc( sizeof(struct cegw_rule), GFP_KERNEL );
-                       if( rule == NULL )
-                       {
-                               break;
-                       }
+               /* ToDo: valid listen address */
+               set = kmalloc(sizeof(*set), GFP_KERNEL);
+               if (set == NULL)
+                       return -ENOMEM;
+               set->eth_ip   = *(struct in_addr*)nla_data(tb[CEGW_ETH_IP]);
+               set->eth_port = *(unsigned short*)nla_data(tb[CEGW_ETH_PORT]);
+               kthread_run(cegw_thread_start, set, "canethgw");
+               break;
+       case CEGW_RULE_CAN_ETH:
+               if (!tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] || 
+                   !tb[CEGW_CAN_IFINDEX]) {
+                       pr_devel("canethgw: missing attribute for "
+                                "CEGW_RULE_CAN_ETH\n");
+                       return -EINVAL;
+               }
 
-                       rule->can_ifindex = ifindex;
-                       rule->eth_ip = ip;
-                       rule->eth_port = port;
+               ifindex = *(int*)nla_data(tb[CEGW_CAN_IFINDEX]);
+               ip = *(struct in_addr*)nla_data(tb[CEGW_ETH_IP]);
+               port = *(unsigned short*)nla_data(tb[CEGW_ETH_PORT]);
+               pr_devel("canethgw: new can->eth rule - (%d)->(%x:%hu)\n",
+                        ifindex, ip.s_addr, port);
+
+               rule = kmalloc(sizeof(struct cegw_rule), GFP_KERNEL);
+               if (rule == NULL)
+                       return -ENOMEM;
+
+               rule->can_ifindex = ifindex;
+               rule->eth_ip = ip;
+               rule->eth_port = port;
+
+               hlist_add_head_rcu(&rule->list, &rule_can_eth);
+               break;
+       case CEGW_RULE_ETH_CAN:
+               if (!tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] || 
+                   !tb[CEGW_CAN_IFINDEX]) {
+                       pr_devel("canethgw: missing attribute for"
+                                "CEGW_RULE_ETH_CAN\n");
+                       return -EINVAL;
+               }
 
-                       hlist_add_head_rcu( &rule->list, &cegw_rule_eth_can );
-                       break;
-               default:
-                       pr_devel( "canethgw: unknown CEGW_CMD_INFO\n" );
-                       break;
+               ifindex = *(int*)nla_data(tb[CEGW_CAN_IFINDEX]);
+               ip = *(struct in_addr*)nla_data(tb[CEGW_ETH_IP]);
+               port = *(unsigned short*)nla_data(tb[CEGW_ETH_PORT]);
+               pr_devel("canethgw: new eth->can rule - (%x:%hu)->(%d)\n",
+                        ip.s_addr, port, ifindex);
+
+               rule = kmalloc(sizeof(struct cegw_rule), GFP_KERNEL);
+               if (rule == NULL)
+                       return -ENOMEM;
+
+               rule->can_ifindex = ifindex;
+               rule->eth_ip = ip;
+               rule->eth_port = port;
+
+               hlist_add_head_rcu(&rule->list, &rule_eth_can);
+               break;
+       default:
+               pr_devel("canethgw: unknown CEGW_CMD_INFO\n");
+               break;
        }
 
        return 0;
 }
 
-static void cegw_flush( void )
+static void cegw_flush(void)
 {
-       struct cegw_rulerule;
-       struct hlist_node* pos,* n;
+       struct cegw_rule *rule;
+       struct hlist_node *pos, *n;
 
-       hlist_for_each_entry_safe( rule, pos, n, &cegw_rule_can_eth, list )
-       {
-               hlist_del( &rule->list );
-               kfree( rule );
+       hlist_for_each_entry_safe(rule, pos, n, &rule_can_eth, list) {
+               hlist_del(&rule->list);
+               kfree(rule);
+       }
+       hlist_for_each_entry_safe(rule, pos, n, &rule_eth_can, list) {
+               hlist_del(&rule->list);
+               kfree(rule);
        }
-       hlist_for_each_entry_safe( rule, pos, n, &cegw_rule_eth_can, list )
-       {
-               hlist_del( &rule->list );
-               kfree( rule );
-       }       
 }
 
-static int cegw_delroute( struct sk_buff* skb, struct nlmsghdr* nlh, void* arg )
+static int cegw_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
-       struct rtmsgr;
-       struct nlattr* tb[ CEGW_MAX+1 ];
+       struct rtmsg *r;
+       struct nlattr *tb[CEGW_MAX+1];
        int err = 0;
 
-       if( nlmsg_len(nlh) < sizeof(*r) )
+       if (nlmsg_len(nlh) < sizeof(*r))
                return -EINVAL;
-       
-       r = nlmsg_data( nlh );
 
-       if( r->rtm_family != AF_CAN )
+       r = nlmsg_data(nlh);
+
+       if (r->rtm_family != AF_CAN)
                return -EPFNOSUPPORT;
 
-       err = nlmsg_parse( nlh, sizeof(struct rtmsg), tb, CEGW_MAX, NULL );
-       if( err != 0 )
+       err = nlmsg_parse(nlh, sizeof(struct rtmsg), tb, CEGW_MAX, NULL);
+       if (err != 0)
                return -EINVAL;
 
-       if( tb[CEGW_CMD_INFO] == NULL )
-       {
-               pr_devel( "canethgw: CEGW_CMD_INFO is missing in rtmsg\n" );
+       if (tb[CEGW_CMD_INFO] == NULL) {
+               pr_devel("canethgw: CEGW_CMD_INFO is missing in rtmsg\n");
                return -EINVAL;
        }
-       
-       if( *(int*)nla_data( tb[CEGW_CMD_INFO] ) != CEGW_FLUSH )
-       {
+
+       if (*(int*)nla_data(tb[CEGW_CMD_INFO]) != CEGW_FLUSH) {
                return -EINVAL;
        }
 
@@ -358,122 +349,110 @@ static int cegw_delroute( struct sk_buff* skb, struct nlmsghdr* nlh, void* arg )
        return 0;
 }
 
-static int cegw_put_rule( struct sk_buff* skb, int type, struct cegw_rule* rule )
+static int cegw_put_rule(struct sk_buff *skb, int type, struct cegw_rule *rule)
 {
        int ifindex;
        struct in_addr ip;
        unsigned short port;
-       struct nlmsghdrnlh;
+       struct nlmsghdr *nlh;
 
        ifindex = rule->can_ifindex;
        ip = rule->eth_ip;
        port = rule->eth_port;
 
-       nlh = nlmsg_put( skb, 0, 0, 0, 0, 0 );
-       if( nlh == NULL )
+       nlh = nlmsg_put(skb, 0, 0, 0, 0, 0);
+       if (nlh == NULL)
                return -EMSGSIZE;
 
        /* type */
-       if( nla_put( skb, CEGW_TYPE, sizeof(type), &type ) < 0 )
+       if (nla_put(skb, CEGW_TYPE, sizeof(type), &type) < 0)
                goto cancel;
        else
-               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN( sizeof(type) );
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(type));
 
        /* can ifindex */
-       if( nla_put( skb, CEGW_CAN_IFINDEX, sizeof(ifindex), &ifindex ) < 0 )
+       if (nla_put(skb, CEGW_CAN_IFINDEX, sizeof(ifindex), &ifindex) < 0)
                goto cancel;
        else
-               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN( sizeof(ifindex) );
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(ifindex));
 
        /* ip adress */
-       if( nla_put( skb, CEGW_ETH_IP, sizeof(ip), &ip) < 0 )
+       if (nla_put(skb, CEGW_ETH_IP, sizeof(ip), &ip) < 0)
                goto cancel;
        else
-               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN( sizeof(ip) );
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(ip));
 
        /* port */
-       if( nla_put( skb, CEGW_ETH_PORT, sizeof(port), &port ) < 0 )
+       if (nla_put(skb, CEGW_ETH_PORT, sizeof(port), &port) < 0)
                goto cancel;
        else
-               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN( sizeof(port) );
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(port));
 
        return skb->len;
 
 cancel:
-       nlmsg_cancel( skb, nlh );
+       nlmsg_cancel(skb, nlh);
        return -EMSGSIZE;
 }
 
-static int cegw_getroute( struct sk_buff* skb, struct netlink_callback* cb )
+static int cegw_getroute(struct sk_buff *skb, struct netlink_callback *cb)
 {
-       struct cegw_rulerule;
-       struct hlist_nodepos;
+       struct cegw_rule *rule;
+       struct hlist_node *pos;
        int idx = 0;
        int s_idx = cb->args[0];
 
-       /* ToDo: skb max size */
-
        rcu_read_lock();
-       hlist_for_each_entry_rcu( rule, pos, &cegw_rule_eth_can, list )
-       {
-               if( idx < s_idx )
+       hlist_for_each_entry_rcu(rule, pos, &rule_eth_can, list) {
+               if (idx < s_idx)
                        goto cont1;
 
-               if( cegw_put_rule( skb, CEGW_RULE_ETH_CAN, rule ) < 0 )
+               if (cegw_put_rule(skb, CEGW_RULE_ETH_CAN, rule) < 0)
                        goto brk;
 cont1:
                idx++;
        }
-       rcu_read_unlock();
 
-       rcu_read_lock();
-       hlist_for_each_entry_rcu( rule, pos, &cegw_rule_can_eth, list )
-       {
-               if( idx < s_idx )
+       hlist_for_each_entry_rcu(rule, pos, &rule_can_eth, list) {
+               if (idx < s_idx)
                        goto cont2;
 
-               if( cegw_put_rule( skb, CEGW_RULE_CAN_ETH, rule ) < 0 )
+               if (cegw_put_rule(skb, CEGW_RULE_CAN_ETH, rule) < 0)
                        goto brk;
-
 cont2:
                idx++;
        }
-       rcu_read_unlock();
 
 brk:
+       rcu_read_unlock();
        cb->args[0] = idx;
 
        return skb->len;
 }
 
-static int cegw_notifier( struct notifier_block* nb, unsigned long msg, void* data )
+static int cegw_notifier(struct notifier_block *nb, unsigned long msg, void *data)
 {
-       struct net_device* dev = (struct net_device*)data;
-       struct cegw_rulerule;
-       struct hlist_node* pos,* n;
+       struct net_device *dev = (struct net_device *)data;
+       struct cegw_rule *rule;
+       struct hlist_node *pos, *n;
 
-       if( !net_eq(dev_net(dev), &init_net) )
+       if (!net_eq(dev_net(dev), &init_net))
                return NOTIFY_DONE;
-       if( dev->type != ARPHRD_CAN )
+       if (dev->type != ARPHRD_CAN)
                return NOTIFY_DONE;
 
-       if( msg == NETDEV_UNREGISTER )
-       {
-               hlist_for_each_entry_safe( rule, pos, n, &cegw_rule_eth_can, list )
-               {
-                       if( rule->can_ifindex == dev->ifindex )
-                       {
-                               hlist_del( &rule->list );
-                               kfree( rule );
+       if (msg == NETDEV_UNREGISTER) {
+               hlist_for_each_entry_safe(rule, pos, n, &rule_eth_can, list) {
+                       if (rule->can_ifindex == dev->ifindex) {
+                               hlist_del(&rule->list);
+                               kfree(rule);
                        }
                }
 
-               hlist_for_each_entry_safe( rule, pos, n, &cegw_rule_can_eth, list )
-               {
-                       if( rule->can_ifindex == dev->ifindex )
-                       {
-                               hlist_del( &rule->list );
-                               kfree( rule );
+               hlist_for_each_entry_safe(rule, pos, n, &rule_can_eth, list) {
+                       if (rule->can_ifindex == dev->ifindex) {
+                               hlist_del(&rule->list);
+                               kfree(rule);
                        }
                }
        }
@@ -483,163 +462,158 @@ static int cegw_notifier( struct notifier_block* nb, unsigned long msg, void* da
 
 /**
  * cegw_thread_start - start working threads
+ * @data: (struct cegw_setting *) with new listening address
+ *
  * Two threads are started. One is serving udp->can routing and the other
  * can->udp.
- *
- * @return 0 on success, -1 otherwise
  */
-static int cegw_thread_start( void* data )
+static int cegw_thread_start(void *data)
 {
        struct sockaddr_in udp_addr;
        struct sockaddr_can can_addr;
-       struct cegw_settingset;
+       struct cegw_setting *set;
 
-       set = (struct cegw_setting*)data;
+       set = (struct cegw_setting *)data;
 
        can_addr.can_family = AF_CAN;
        can_addr.can_ifindex = 0;
-       
+
        udp_addr.sin_family = AF_INET;
-       udp_addr.sin_port = htons( set->eth_port );
+       udp_addr.sin_port = htons(set->eth_port);
        udp_addr.sin_addr = set->eth_ip;
 
-       kfree( set );
-       mutex_lock( &cegw_mutex );
-       if( cegw_state == CEGW_EXIT )
+       kfree(data);
+       mutex_lock(&cegw_mutex);
+       if (cegw_state == CEGW_EXIT)
                return -1;
        /* stops threads if exist */
        cegw_thread_stop();
 
        /* create and bind sockets */
-       if( sock_create_kern( PF_INET, SOCK_DGRAM, IPPROTO_UDP, &udp_sock) != 0 )
-       {
-               printk( KERN_ERR "canethgw: udp socket creation failed\n" );
+       if (sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &udp_sock)
+           != 0) {
+               printk(KERN_ERR "canethgw: udp socket creation failed\n");
                return -1;
        }
 
-       if( sock_create_kern( PF_CAN, SOCK_RAW, CAN_RAW, &can_sock) != 0 )
-       {
-               printk( KERN_ERR "canethgw: can socket creation failed\n" );
+       if (sock_create_kern(PF_CAN, SOCK_RAW, CAN_RAW, &can_sock) != 0) {
+               printk(KERN_ERR "canethgw: can socket creation failed\n");
                return -1;
        }
 
-       if( kernel_bind( udp_sock, (struct sockaddr*)&udp_addr, sizeof( udp_addr ) ) != 0 )
-       {
-               printk( KERN_ERR "canethgw: udp socket binding failed\n" );
-               sock_release( udp_sock );
-               sock_release( can_sock );
+       if (kernel_bind(udp_sock, (struct sockaddr*)&udp_addr,
+                       sizeof(udp_addr)) != 0) {
+               printk(KERN_ERR "canethgw: udp socket binding failed\n");
+               sock_release(udp_sock);
+               sock_release(can_sock);
                return -1;
        }
 
-       if( kernel_bind( can_sock, (struct sockaddr*) &can_addr, sizeof(can_addr) ) != 0 )
-       {
-               printk( KERN_ERR "canethgw: can socket binding failed\n" );
-               kernel_sock_shutdown( udp_sock, SHUT_RDWR );
-               sock_release( udp_sock );
-               sock_release( can_sock );
+       if (kernel_bind(can_sock, (struct sockaddr*) &can_addr,
+                       sizeof(can_addr)) != 0) {
+               printk(KERN_ERR "canethgw: can socket binding failed\n");
+               kernel_sock_shutdown(udp_sock, SHUT_RDWR);
+               sock_release(udp_sock);
+               sock_release(can_sock);
                return -1;
        }
 
        /* start threads */
        cegw_state = CEGW_RUN;
 
-       eth_to_can = kthread_create( cegw_udp_can, NULL, "canethgw" );
-       if( IS_ERR( eth_to_can ) )
-       {
+       eth_to_can = kthread_create(cegw_udp_can, NULL, "canethgw");
+       if (IS_ERR(eth_to_can)) {
                cegw_state = CEGW_STOP;
-               sock_release( udp_sock );
-               sock_release( can_sock );
+               sock_release(udp_sock);
+               sock_release(can_sock);
                return -1;
-       }       
-       get_task_struct( eth_to_can );
-       wake_up_process( eth_to_can );
+       }
+       get_task_struct(eth_to_can);
+       wake_up_process(eth_to_can);
 
-       can_to_eth = kthread_create( cegw_can_udp, NULL, "canethgw" );
-       if( IS_ERR( can_to_eth ) )
-       {
+       can_to_eth = kthread_create(cegw_can_udp, NULL, "canethgw");
+       if (IS_ERR(can_to_eth)) {
                cegw_state = CEGW_STOP;
-               kernel_sock_shutdown( udp_sock, SHUT_RDWR );
-               kthread_stop( eth_to_can );
-               sock_release( udp_sock );
-               sock_release( can_sock );
+               kernel_sock_shutdown(udp_sock, SHUT_RDWR);
+               kthread_stop(eth_to_can);
+               sock_release(udp_sock);
+               sock_release(can_sock);
                return -1;
        }
-       /* ToDo: free this? */
-       get_task_struct( can_to_eth );
-       wake_up_process( can_to_eth );
-       
-       mutex_unlock( &cegw_mutex );
-       pr_devel( "threads are running\n" );
+       get_task_struct(can_to_eth);
+       wake_up_process(can_to_eth);
+
+       mutex_unlock(&cegw_mutex);
+       pr_devel("threads are running\n");
        return 0;
 }
 
 /**
- * cegw_thread_stop
- * Waits for threads to stop. Does nothing if cegw_state == CEGW_STOP.
+ * cegw_thread_stop - stops threads and wait for exit
  *
- * @return 0
+ * Waits for threads to stop. Does nothing if cegw_state == CEGW_STOP.
  */
-static int cegw_thread_stop( void )
+static int cegw_thread_stop(void)
 {
        int how = SHUT_RDWR;
-       struct socksk = NULL;
+       struct sock *sk = NULL;
 
-       if( cegw_state == CEGW_STOP )
+       if (cegw_state == CEGW_STOP)
                return 0;
 
        cegw_state = CEGW_STOP;
        /* shut down socket */
        sk = can_sock->sk;
        how++;
-       lock_sock( sk );
+       lock_sock(sk);
        sk->sk_shutdown |= how;
-       sk->sk_state_change( sk );
-       release_sock( sk );
+       sk->sk_state_change(sk);
+       release_sock(sk);
 
-       kernel_sock_shutdown( udp_sock, SHUT_RDWR );
+       kernel_sock_shutdown(udp_sock, SHUT_RDWR);
 
        /* wait for return to reuse port if restart */
-       kthread_stop( eth_to_can );
-       kthread_stop( can_to_eth );
-       sock_release( udp_sock );
-       sock_release( can_sock );
+       kthread_stop(eth_to_can);
+       kthread_stop(can_to_eth);
+       sock_release(udp_sock);
+       sock_release(can_sock);
        can_to_eth = NULL;
        eth_to_can = NULL;
 
        return 0;
 }
 
-static int __init cegw_init( void )
+static int __init cegw_init(void)
 {
        notifier.notifier_call = cegw_notifier;
-       register_netdevice_notifier( &notifier );
+       register_netdevice_notifier(&notifier);
 
        /* subscribe to netlink */
-       rtnl_register( PF_CAN, RTM_GETROUTE, NULL, cegw_getroute, NULL );
-       rtnl_register( PF_CAN, RTM_NEWROUTE, cegw_newroute, NULL, NULL );
-       rtnl_register( PF_CAN, RTM_DELROUTE, cegw_delroute, NULL, NULL );
+       rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cegw_getroute, NULL);
+       rtnl_register(PF_CAN, RTM_NEWROUTE, cegw_newroute, NULL, NULL);
+       rtnl_register(PF_CAN, RTM_DELROUTE, cegw_delroute, NULL, NULL);
 
        return 0;
 }
 
-static void __exit cegw_exit( void )
+static void __exit cegw_exit(void)
 {
        /* ToDo: effect on cangw? */
-       rtnl_unregister_all( PF_CAN );
+       rtnl_unregister_all(PF_CAN);
 
        /* wait for rtnl callbacks */
        rtnl_lock();
        rtnl_unlock();
 
-       mutex_lock( &cegw_mutex );
+       mutex_lock(&cegw_mutex);
        cegw_thread_stop();
        cegw_state = CEGW_EXIT;
-       mutex_unlock( &cegw_mutex );
+       mutex_unlock(&cegw_mutex);
 
-       unregister_netdevice_notifier( &notifier );
+       unregister_netdevice_notifier(&notifier);
        cegw_flush();
 }
 
-module_init( cegw_init );
-module_exit( cegw_exit );
+module_init(cegw_init);
+module_exit(cegw_exit);