[linux-next] LinuxNextTracking branch, master, updated. next-20130531

batman at open-mesh.org batman at open-mesh.org
Sat Jun 1 00:18:27 CEST 2013


The following commit has been merged in the master branch:
commit a3b81b67de6ae0475c0c34c552c059f7bea2f520
Author: Antonio Quartulli <antonio at open-mesh.com>
Date:   Thu Mar 28 14:21:12 2013 +0100

    batman-adv: don't check compat version twice
    
    Compatibility version is checked upon packet reception
    before calling any handler. For this reason it does need to
    be checked once more in the handler itself.
    
    Signed-off-by: Antonio Quartulli <antonio at open-mesh.com>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 6d62e29..38183dc 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1054,13 +1054,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
 	}
 	rcu_read_unlock();
 
-	if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
-		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-			   "Drop packet: incompatible batman version (%i)\n",
-			   batadv_ogm_packet->header.version);
-		return;
-	}
-
 	if (is_my_addr) {
 		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
 			   "Drop packet: received my own broadcast (sender: %pM)\n",

-- 
LinuxNextTracking


More information about the linux-merge mailing list