[commits] [git] linux integration branch, linux, updated. v2.6.36-rc3-491-g8001773

postmaster at open-mesh.net postmaster at open-mesh.net
Sun Sep 5 01:24:07 CEST 2010


The following commit has been merged in the linux branch:
commit b4fb4917c35c29b183bee3f60c55156200f091a0
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Sep 4 18:25:43 2010 +0200

    batman-adv: Add missing include for bat_sys.h
    
    soft_interface.c needs sysfs_add_meshif and sysfs_del_meshif after
    "batman-adv: attach each hard-interface to a soft-interface". This
    Include is provided indirectly using compat.h on standalone sources, but
    missing on kernel builds.
    
    We should add it directly as the compat.h include is only a side effect
    we cannot rely on.
    
    Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>

diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c
index 15a7c1e..592cb39 100644
--- a/drivers/staging/batman-adv/soft-interface.c
+++ b/drivers/staging/batman-adv/soft-interface.c
@@ -29,6 +29,7 @@
 #include "types.h"
 #include "hash.h"
 #include "send.h"
+#include "bat_sysfs.h"
 #include <linux/slab.h>
 #include <linux/ethtool.h>
 #include <linux/etherdevice.h>

-- 
linux integration


More information about the commits mailing list