Merge branch 'master' of https://github.com/CANopenNode/CANopenLinux

# Conflicts:
#	CO_epoll_interface.c

diff --cc CO_epoll_interface.c
index 995e10090fcfa0d3673d8c5b34fc8e3e5887ad86,4959a9a109aee5686c3a7e31f088b25746ce575a..eb6bf1f22c13c925618ad4e402129fe07fae871b
--- 1/CO_epoll_interface.c
--- 2/CO_epoll_interface.c
+++ b/CO_epoll_interface.c
@@@ -345,8 -380,7 +345,8 @@@ gtwa_write_response(void* object, cons
      return nWritten;
  }
  
 -static inline void socketAcceptEnableForEpoll(CO_epoll_gtw_t *epGtw) {
 +static inline void
- socetAcceptEnableForEpoll(CO_epoll_gtw_t* epGtw) {
++socketAcceptEnableForEpoll(CO_epoll_gtw_t* epGtw) {
      struct epoll_event ev = {0};
      int ret;
  
@@@ -547,12 -602,17 +547,12 @@@ CO_epoll_processGtw(CO_epoll_gtw_t* epG
              }
  
              if (fail) {
-                 socetAcceptEnableForEpoll(epGtw);
+                 socketAcceptEnableForEpoll(epGtw);
              }
              ep->epoll_new = false;
 -        }
 -        else if ((ep->ev.events & EPOLLIN) != 0
 -             && ep->ev.data.fd == epGtw->gtwa_fd
 -        ) {
 +        } else if ((ep->ev.events & EPOLLIN) != 0 && ep->ev.data.fd == epGtw->gtwa_fd) {
              char buf[CO_CONFIG_GTWA_COMM_BUF_SIZE];
 -            size_t space = co->nodeIdUnconfigured ?
 -                        CO_CONFIG_GTWA_COMM_BUF_SIZE :
 -                        CO_GTWA_write_getSpace(co->gtwa);
 +            size_t space = co->nodeIdUnconfigured ? CO_CONFIG_GTWA_COMM_BUF_SIZE : CO_GTWA_write_getSpace(co->gtwa);
  
              ssize_t s = read(epGtw->gtwa_fd, buf, space);
  
@@@ -585,8 -652,9 +585,8 @@@
                              log_printf(LOG_CRIT, DBG_ERRNO, "close(gtwa_fd)");
                          }
                          epGtw->gtwa_fd = -1;
-                         socetAcceptEnableForEpoll(epGtw);
+                         socketAcceptEnableForEpoll(epGtw);
 -                    }
 -                    else {
 +                    } else {
                          CO_GTWA_write(co->gtwa, buf, s);
                      }
                  }
@@@ -614,8 -688,9 +614,8 @@@
                  log_printf(LOG_CRIT, DBG_ERRNO, "close(gtwa_fd), tmo");
              }
              epGtw->gtwa_fd = -1;
-             socetAcceptEnableForEpoll(epGtw);
+             socketAcceptEnableForEpoll(epGtw);
 -        }
 -        else {
 +        } else {
              epGtw->socketTimeoutTmr_us += ep->timeDifference_us;
          }
      }