| 1 | --- a/src/drv_tapi_linux.c |
| 2 | +++ b/src/drv_tapi_linux.c |
| 3 | @@ -544,7 +544,7 @@ static ssize_t ifx_tapi_write (struct fi |
| 4 | IFX_uint8_t *pData; |
| 5 | IFX_size_t buf_size; |
| 6 | #endif /* TAPI_PACKET */ |
| 7 | - IFX_ssize_t size = 0; |
| 8 | + ssize_t size = 0; |
| 9 | |
| 10 | #ifdef TAPI_PACKET |
| 11 | if (pTapiDev->bInitialized == IFX_FALSE) |
| 12 | @@ -3600,7 +3600,11 @@ IFX_void_t TAPI_OS_ThreadKill(IFXOS_Thre |
| 13 | flag and released after the down() call. */ |
| 14 | lock_kernel(); |
| 15 | mb(); |
| 16 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) |
| 17 | kill_proc(pThrCntrl->tid, SIGKILL, 1); |
| 18 | +#else |
| 19 | + kill_pid(find_vpid(pThrCntrl->tid), SIGKILL, 1); |
| 20 | +#endif |
| 21 | /* release the big kernel lock */ |
| 22 | unlock_kernel(); |
| 23 | wait_for_completion (&pThrCntrl->thrCompletion); |
| 24 | --- a/src/drv_tapi_osmap.h |
| 25 | +++ b/src/drv_tapi_osmap.h |
| 26 | @@ -17,39 +17,6 @@ |
| 27 | */ |
| 28 | |
| 29 | #include "ifx_types.h" /* ifx type definitions */ |
| 30 | - |
| 31 | -#ifndef HAVE_IFX_ULONG_T |
| 32 | - #warning please update your ifx_types.h, using local definition of IFX_ulong_t |
| 33 | - /* unsigned long type - valid for 32bit systems only */ |
| 34 | - typedef unsigned long IFX_ulong_t; |
| 35 | - #define HAVE_IFX_ULONG_T |
| 36 | -#endif /* HAVE_IFX_ULONG_T */ |
| 37 | - |
| 38 | -#ifndef HAVE_IFX_LONG_T |
| 39 | - #warning please update your ifx_types.h, using local definition of IFX_long_t |
| 40 | - /* long type - valid for 32bit systems only */ |
| 41 | - typedef long IFX_long_t; |
| 42 | - #define HAVE_IFX_LONG_T |
| 43 | -#endif /* HAVE_IFX_LONG_T */ |
| 44 | - |
| 45 | -#ifndef HAVE_IFX_INTPTR_T |
| 46 | - #warning please update your ifx_types.h, using local definition of IFX_intptr_t |
| 47 | - typedef IFX_long_t IFX_intptr_t; |
| 48 | - #define HAVE_IFX_INTPTR_T |
| 49 | -#endif /* HAVE_IFX_INTPTR_T */ |
| 50 | - |
| 51 | -#ifndef HAVE_IFX_SIZE_T |
| 52 | - #warning please update your ifx_types.h, using local definition of IFX_size_t |
| 53 | - typedef IFX_ulong_t IFX_size_t; |
| 54 | - #define HAVE_IFX_SIZE_T |
| 55 | -#endif /* HAVE_IFX_SIZE_T */ |
| 56 | - |
| 57 | -#ifndef HAVE_IFX_SSIZE_T |
| 58 | - #warning please update your ifx_types.h, using local definition of IFX_ssize_t |
| 59 | - typedef IFX_long_t IFX_ssize_t; |
| 60 | - #define HAVE_IFX_SSIZE_T |
| 61 | -#endif /* HAVE_IFX_SSIZE_T */ |
| 62 | - |
| 63 | #include "ifxos_interrupt.h" |
| 64 | #include "ifxos_memory_alloc.h" |
| 65 | #include "ifxos_copy_user_space.h" |
| 66 | --- a/include/drv_tapi_ll_interface.h |
| 67 | +++ b/include/drv_tapi_ll_interface.h |
| 68 | @@ -40,13 +40,6 @@ |
| 69 | #include "ifxos_select.h" |
| 70 | #endif /* TAPI_PACKET */ |
| 71 | |
| 72 | -#ifndef HAVE_IFX_ULONG_T |
| 73 | - #warning please update your ifx_types.h, using local definition of IFX_ulong_t |
| 74 | - /* unsigned long type - valid for 32bit systems only */ |
| 75 | - typedef unsigned long IFX_ulong_t; |
| 76 | - #define HAVE_IFX_ULONG_T |
| 77 | -#endif /* HAVE_IFX_ULONG_T */ |
| 78 | - |
| 79 | /* ============================= */ |
| 80 | /* Local Macros Definitions */ |
| 81 | /* ============================= */ |
| 82 | --- a/src/lib/lib_bufferpool/lib_bufferpool.c |
| 83 | +++ b/src/lib/lib_bufferpool/lib_bufferpool.c |
| 84 | @@ -80,24 +80,6 @@ |
| 85 | #include <linux/slab.h> |
| 86 | #endif /* LINUX */ |
| 87 | |
| 88 | - |
| 89 | -/* ============================= */ |
| 90 | -/* Extra type definitions */ |
| 91 | -/* ============================= */ |
| 92 | -#ifndef HAVE_IFX_ULONG_T |
| 93 | - #warning please update your ifx_types.h, using local definition of IFX_ulong_t |
| 94 | - /* unsigned long type - valid for 32bit systems only */ |
| 95 | - typedef unsigned long IFX_ulong_t; |
| 96 | - #define HAVE_IFX_ULONG_T |
| 97 | -#endif /* HAVE_IFX_ULONG_T */ |
| 98 | - |
| 99 | -#ifndef HAVE_IFX_UINTPTR_T |
| 100 | - #warning please update your ifx_types.h, using local definition of IFX_uintptr_t |
| 101 | - typedef IFX_ulong_t IFX_uintptr_t; |
| 102 | - #define HAVE_IFX_UINTPTR_T |
| 103 | -#endif /* HAVE_IFX_UINTPTR_T */ |
| 104 | - |
| 105 | - |
| 106 | /* ============================= */ |
| 107 | /* Local Macros & Definitions */ |
| 108 | /* ============================= */ |
| 109 | |
