maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix legacy kernel conditional compil

Browse Source 
and the line to include modules.h has become commented (weird!)



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6083 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
thomasl
2014-11-23 09:50:23 +00:00
parent d27b0a62a7
commit 1b2c507d36
1 changed files with 0 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/NAS/DRIVER/MESH/netlink.c
-66
View File
@@ -75,7 +75,6 @@ static inline void nasmesh_unlock(void)
mutex_unlock(&nasmesh_mutex); mutex_unlock(&nasmesh_mutex);
} }
#ifdef KERNEL_VERSION_GREATER_THAN_2629
// This can also be implemented using thread to get the data from PDCP without blocking. // This can also be implemented using thread to get the data from PDCP without blocking.
static void nas_nl_data_ready (struct sk_buff *skb) static void nas_nl_data_ready (struct sk_buff *skb)
{ {
@@ -99,58 +98,6 @@ static void nas_nl_data_ready (struct sk_buff *skb)
} }
} }
#else
static struct task_struct *netlink_rx_thread;
// this thread is used to avoid blocking other system calls from entering the kernel
static int nas_netlink_rx_thread(void *data) {
int err;
struct sk_buff *skb = NULL;
struct nlmsghdr *nlh = NULL;
printk("[NAS][NETLINK] Starting RX Thread \n");
while (!kthread_should_stop()) {
if (nas_nl_sk) {
skb = skb_recv_datagram(nas_nl_sk, 0, 0, &err);
if (skb) {
#ifdef NETLINK_DEBUG
printk("[NAS][NETLINK] Received socket from PDCP\n");
#endif //NETLINK_DEBUG
nlh = (struct nlmsghdr *)skb->data;
nas_COMMON_QOS_receive(nlh);
skb_free_datagram(nas_nl_sk,skb);
}
}
else {
if (exit_netlink_thread == 1) {
printk("[NAS][NETLINK] exit_netlink_thread\n");
break;
}
}
} // while
printk("[NAS][NETLINK] Exiting RX thread\n");
return(0);
}
static void nas_nl_data_ready (struct sock *sk, int len)
{
wake_up_interruptible(sk->sk_sleep);
}
#endif
int nas_netlink_init() int nas_netlink_init()
{ {
@@ -172,15 +119,11 @@ int nas_netlink_init()
&oai_netlink_cfg); &oai_netlink_cfg);
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
nas_nl_sk = netlink_kernel_create( nas_nl_sk = netlink_kernel_create(
# ifdef KERNEL_VERSION_GREATER_THAN_2622
&init_net, &init_net,
# endif
NAS_NETLINK_ID, NAS_NETLINK_ID,
0, 0,
nas_nl_data_ready, nas_nl_data_ready,
# ifdef KERNEL_VERSION_GREATER_THAN_2622
&nasmesh_mutex, // NULL &nasmesh_mutex, // NULL
# endif
THIS_MODULE); THIS_MODULE);
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
@@ -190,12 +133,7 @@ int nas_netlink_init()
return(-1); return(-1);
} }
#ifdef KERNEL_VERSION_GREATER_THAN_2629
#else
// Create receive thread
netlink_rx_thread = kthread_run(nas_netlink_rx_thread, NULL, "NAS_NETLINK_RX_THREAD");
#endif
return(0); return(0);
@@ -208,11 +146,7 @@ void nas_netlink_release(void) {
printk("[NAS][NETLINK] Releasing netlink socket\n"); printk("[NAS][NETLINK] Releasing netlink socket\n");
if(nas_nl_sk){ if(nas_nl_sk){
#ifdef KERNEL_VERSION_GREATER_THAN_2629
netlink_kernel_release(nas_nl_sk); //or skb->sk netlink_kernel_release(nas_nl_sk); //or skb->sk
#else
sock_release(nas_nl_sk->sk_socket);
#endif
} }