+--- a/src/linux/ifxos_linux_socket_drv.c
++++ b/src/linux/ifxos_linux_socket_drv.c
+@@ -19,6 +19,7 @@
+ /* ============================================================================
+ IFX Linux adaptation - Global Includes - Kernel
+ ========================================================================= */
++#include <linux/version.h>
+ #include <linux/kernel.h>
+ #ifdef MODULE
+ #include <linux/module.h>
+@@ -166,23 +167,33 @@ IFX_int_t IFXOS_SocketSendTo(
+ IFXOS_RETURN_IF_POINTER_NULL(pBuffer, IFX_ERROR);
+ IFXOS_RETURN_IF_ARG_LE_ZERO(bufSize_byte, IFX_ERROR);
+
++ iov.iov_base = pBuffer;
++ iov.iov_len = (unsigned int) bufSize_byte;
++
+ msg.msg_name = (void *) pSocAddr;
+ msg.msg_namelen = sizeof(IFXOS_sockAddr_t);
+- msg.msg_iov = &iov;
+- msg.msg_iovlen = 1;
+ msg.msg_control = IFX_NULL;
+ msg.msg_controllen = 0;
+ msg.msg_flags = MSG_DONTWAIT;
+
+- msg.msg_iov->iov_base = pBuffer;
+- msg.msg_iov->iov_len = (unsigned int) bufSize_byte;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
++ msg.msg_iov = &iov;
++ msg.msg_iovlen = 1;
++#else
++ iov_iter_init(&msg.msg_iter, WRITE, &iov, 1, bufSize_byte);
++#endif
+
+ /* Modify address limitation which is used if user space is calling
+ kernel space, otherwise sock_sendmsg() will fail.*/
+ old_fs = get_fs();
+ set_fs(KERNEL_DS);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+ ret = sock_sendmsg((struct socket *) socFd, &msg, bufSize_byte);
++#else
++ ret = sock_sendmsg((struct socket *) socFd, &msg);
++#endif
++
+ set_fs(old_fs);
+
+ return ret;
+--- a/src/linux/ifxos_linux_memory_map_drv.c
++++ b/src/linux/ifxos_linux_memory_map_drv.c
+@@ -25,6 +25,7 @@
+ IFX Linux adaptation - Global Includes - Kernel
+ ========================================================================= */
+
++#include <linux/version.h>
+ #include <linux/kernel.h>
+ #ifdef MODULE
+ #include <linux/module.h>
+@@ -87,6 +88,7 @@ IFX_int32_t IFXOS_Phy2VirtMap(
+ IFXOS_RETURN_IF_POINTER_NOT_NULL(*ppVirtAddr, IFX_ERROR);
+ IFXOS_RETURN_IF_ARG_LE_ZERO(addrRangeSize_byte, IFX_ERROR);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
+ if ( check_mem_region(physicalAddr, addrRangeSize_byte) )
+ {
+ IFXOS_PRN_USR_ERR_NL( IFXOS, IFXOS_PRN_LEVEL_ERR,
+@@ -98,6 +100,16 @@ IFX_int32_t IFXOS_Phy2VirtMap(
+
+ /* can't fail */
+ request_mem_region(physicalAddr, addrRangeSize_byte, pName);
++#else
++ if ( request_mem_region(physicalAddr, addrRangeSize_byte, pName) )
++ {
++ IFXOS_PRN_USR_ERR_NL( IFXOS, IFXOS_PRN_LEVEL_ERR,
++ ("IFXOS: ERROR Phy2Virt map, region request - addr 0x%08lX (size 0x%lX) not free" IFXOS_CRLF,
++ physicalAddr, addrRangeSize_byte));
++
++ return IFX_ERROR;
++ }
++#endif
+
+ /* remap memory (not cache able): physical --> virtual */
+ pVirtAddr = (IFX_uint8_t *)ioremap_nocache( physicalAddr,