diff options
Diffstat (limited to 'recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch')
-rw-r--r-- | recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch b/recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch deleted file mode 100644 index 80118a4..0000000 --- a/recipes-enea/linx/linx-mod-2.6.6/support-for-3.15-kernels.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | Fixed build errors for linx-mod with kernel >= 3.15.0 | ||
2 | |||
3 | Upstream-Status: Not Applicable | ||
4 | |||
5 | Signed-off-by: Huimin She <huimin.she@enea.com> | ||
6 | |||
7 | --- | ||
8 | diff -rup a/af_linx.c b/af_linx.c | ||
9 | --- a/af_linx.c 2014-07-25 16:22:23.295570583 +0200 | ||
10 | +++ b/af_linx.c 2014-07-25 16:22:23.299570583 +0200 | ||
11 | @@ -743,7 +743,11 @@ setup_receive_filter(struct sock *sk, st | ||
12 | /* This function is called to wake up a receiving socket when it is sleeping | ||
13 | * waiting for a new message in poll or select. | ||
14 | */ | ||
15 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) | ||
16 | static void linx_data_ready(struct sock *sk, int len) | ||
17 | +#else | ||
18 | +static void linx_data_ready(struct sock *sk) | ||
19 | +#endif | ||
20 | { | ||
21 | linx_check_sock(sk); | ||
22 | |||
23 | @@ -1401,7 +1405,11 @@ linx_do_legacy_sendmsg(struct sock *sk, | ||
24 | LINX_SOCK_STAT_QUEUE_SIGNAL(to, payload_size); | ||
25 | #endif | ||
26 | /* Wake up the receiver, if it sleeps and wait for the signal. */ | ||
27 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) | ||
28 | to->sk_data_ready(to, payload_size); | ||
29 | +#else | ||
30 | + to->sk_data_ready(to); | ||
31 | +#endif | ||
32 | |||
33 | return 0; | ||
34 | out: | ||
35 | @@ -1577,7 +1585,11 @@ linx_do_sendmsg(struct sock *sk, | ||
36 | LINX_SOCK_STAT_QUEUE_SIGNAL(to, payload_size); | ||
37 | #endif | ||
38 | /* Wake up the receiver, if it sleeps and wait for the signal. */ | ||
39 | - to->sk_data_ready(to, payload_size); | ||
40 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) | ||
41 | + to->sk_data_ready(to, payload_size); | ||
42 | +#else | ||
43 | + to->sk_data_ready(to); | ||
44 | +#endif | ||
45 | |||
46 | return 0; | ||
47 | out: | ||
48 | @@ -1636,7 +1648,11 @@ int __linx_do_sendmsg_skb_to_local_sk(st | ||
49 | LINX_SOCK_STAT_QUEUE_SIGNAL(to, payload_size); | ||
50 | #endif | ||
51 | /* Wake up the receiver, if it sleeps and waits for the signal. */ | ||
52 | - to->sk_data_ready(to, payload_size); | ||
53 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) | ||
54 | + to->sk_data_ready(to, payload_size); | ||
55 | +#else | ||
56 | + to->sk_data_ready(to); | ||
57 | +#endif | ||
58 | |||
59 | return 0; | ||
60 | } | ||