Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-eth-gw

Conflicts:
	utils/cegw/cegw.c

diff --cc utils/cegw/cegw.c
index c0e67f0f89e61ff5cf56fedd4ff0f87f0fa2e83b,0036dbb7affdf6a975ead274ed6149451a156309..67953fe02b56d92e2010c02ca49e680d5d87e0c3
--- 1/utils/cegw/cegw.c
--- 2/utils/cegw/cegw.c
+++ b/utils/cegw/cegw.c
@@@ -189,14 -157,20 +157,19 @@@ int main(int argc, char *argv[]
        struct cegw_ioctl *gwctl = NULL;
        struct can_filter *filter = NULL;
  
 -      if (argc == 1) {
+       /* udp_addr can store both - in and in6 addresses */
+       struct sockaddr_in6 udp6_addr;
+       struct sockaddr *udp_addr = (struct sockaddr *) &udp6_addr;
+ 
+ 
 +      if (argc == 1 || (argc == 2 && strcmp(argv[1], "-h") == 0)) {
                printf(help_msg, argv[0], argv[0]);
                return 0;
        }
  
        if (argc < 4) {
-               perr("not enough arguments");
+               fprintf(stderr, "not enough arguments\n");
                printf(help_msg, argv[0], argv[0]);
 -              /* ToDo: print usage */
                return 1;
        }