This patch (hopefully) fixes batman and batman-advanced compile on 2.6.24 kernel.
Signed-off-by: Vasilis Tsiligiannis <[EMAIL PROTECTED]>
---
.../patches/100-linux-2.6.24_fix.patch | 27 ++++++++++++++++++++
.../net/batman/patches/100-linux-2.6.24_fix.patch | 23 +++++++++++++++++
2 files changed, 50 insertions(+), 0 deletions(-)
create mode 100644
packages/net/batman-advanced/patches/100-linux-2.6.24_fix.patch
create mode 100644 packages/net/batman/patches/100-linux-2.6.24_fix.patch
diff --git a/packages/net/batman-advanced/patches/100-linux-2.6.24_fix.patch
b/packages/net/batman-advanced/patches/100-linux-2.6.24_fix.patch
new file mode 100644
index 0000000..d0b3317
--- /dev/null
+++ b/packages/net/batman-advanced/patches/100-linux-2.6.24_fix.patch
@@ -0,0 +1,27 @@
+diff -Naur batman-adv-r963/batman-adv-kernelland/batman-core/batman-adv-proc.c
batman-adv-r963.patched/batman-adv-kernelland/batman-core/batman-adv-proc.c
+--- batman-adv-r963/batman-adv-kernelland/batman-core/batman-adv-proc.c
2008-01-28 09:47:47.000000000 +0200
++++
batman-adv-r963.patched/batman-adv-kernelland/batman-core/batman-adv-proc.c
2008-03-24 18:33:36.000000000 +0200
+@@ -63,12 +63,12 @@
+ remove_proc_entry(PROC_FILE_INTERFACES, proc_batman_dir);
+
+ if (proc_batman_dir)
+- remove_proc_entry(PROC_ROOT_DIR, proc_net);
++ remove_proc_entry(PROC_ROOT_DIR, init_net.proc_net);
+ }
+
+ int setup_procfs(void)
+ {
+- proc_batman_dir = proc_mkdir(PROC_ROOT_DIR, proc_net);
++ proc_batman_dir = proc_mkdir(PROC_ROOT_DIR, init_net.proc_net);
+
+ if (!proc_batman_dir) {
+ printk("batman-adv: Registering the '/proc/net/%s' folder
failed\n", PROC_ROOT_DIR);
+@@ -240,7 +240,7 @@
+ } else {
+
+ /* add interface */
+- if ((net_dev = dev_get_by_name(if_string)) == NULL) {
++ if ((net_dev = dev_get_by_name(&init_net, if_string)) == NULL) {
+ debug_log(LOG_TYPE_WARN, "Could not find interface:
%s\n", if_string);
+ goto end;
+ }
diff --git a/packages/net/batman/patches/100-linux-2.6.24_fix.patch
b/packages/net/batman/patches/100-linux-2.6.24_fix.patch
new file mode 100644
index 0000000..93eba05
--- /dev/null
+++ b/packages/net/batman/patches/100-linux-2.6.24_fix.patch
@@ -0,0 +1,23 @@
+diff -Naur batmand-r963/linux/modules/gateway.c
batmand-r963.patched/linux/modules/gateway.c
+--- batmand-r963/linux/modules/gateway.c 2008-01-28 09:47:35.000000000
+0200
++++ batmand-r963.patched/linux/modules/gateway.c 2008-03-24
18:04:41.000000000 +0200
+@@ -512,10 +512,8 @@
+ dev->destructor = free_netdev;
+
+ dev->features |= NETIF_F_NO_CSUM;
+- dev->hard_header_cache = NULL;
+ dev->mtu = 1471;
+ dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
+- dev->hard_header_cache = NULL;
+
+ priv = netdev_priv( dev );
+ memset( priv, 0, sizeof( struct gate_priv ) );
+@@ -762,7 +760,7 @@
+
+ static int setup_procfs(void)
+ {
+- proc_dir = proc_mkdir(PROC_ROOT_DIR, proc_net);
++ proc_dir = proc_mkdir(PROC_ROOT_DIR, init_net.proc_net);
+ clients_file = create_proc_read_entry(PROC_FILE_CLIENTS, S_IRUGO,
proc_dir, proc_clients_read, NULL);
+
+ return(0);
--
1.5.2.5
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ openwrt-devel mailing list [email protected] http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
