fix aodv-uu build on 2.6.19, Makefile cleanup
[openwrt/svn-archive/archive.git] / net / aodv-uu / patches / 002-linux_2.6.19_ip_route_me_harder_change.patch
1 diff -ruN aodv-uu-0.9.3-old/lnx/kaodv-mod.c aodv-uu-0.9.3-new/lnx/kaodv-mod.c
2 --- aodv-uu-0.9.3-old/lnx/kaodv-mod.c 2006-09-20 19:58:38.000000000 +0200
3 +++ aodv-uu-0.9.3-new/lnx/kaodv-mod.c 2006-12-16 22:08:01.000000000 +0100
4 @@ -19,7 +19,7 @@
5 * Author: Erik Nordström, <erik.nordstrom@it.uu.se>
6 *
7 *****************************************************************************/
8 -#include <linux/config.h>
9 +#include <linux/autoconf.h>
10 #include <linux/version.h>
11
12 #ifdef KERNEL26
13 @@ -258,7 +258,11 @@
14 if (!(*skb))
15 return NF_STOLEN;
16
17 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
18 + ip_route_me_harder(skb, RTN_UNSPEC);
19 +#else
20 ip_route_me_harder(skb);
21 +#endif
22 }
23 break;
24 case NF_IP_POST_ROUTING:
25 diff -ruN aodv-uu-0.9.3-old/lnx/kaodv-queue.c aodv-uu-0.9.3-new/lnx/kaodv-queue.c
26 --- aodv-uu-0.9.3-old/lnx/kaodv-queue.c 2006-09-20 19:58:38.000000000 +0200
27 +++ aodv-uu-0.9.3-new/lnx/kaodv-queue.c 2006-12-16 22:17:16.000000000 +0100
28 @@ -29,6 +29,7 @@
29 #include <linux/spinlock.h>
30 #include <linux/sysctl.h>
31 #include <linux/proc_fs.h>
32 +#include <linux/version.h>
33 #include <net/sock.h>
34 #include <net/route.h>
35 #include <net/icmp.h>
36 @@ -246,7 +247,11 @@
37 if (!entry->skb)
38 goto next;
39 }
40 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
41 + ip_route_me_harder(&entry->skb, RTN_UNSPEC);
42 +#else
43 ip_route_me_harder(&entry->skb);
44 +#endif
45
46 pkts++;
47