Changeset 1543

Timestamp:

01/09/10 15:44:04 (7 months ago)

Author:

marek

Message:

batman-adv: don't lock while sending packets

As in other parts of batman-adv, we should not lock while sending a packet but
keep the locked time as short as possible. Additionally, we should check
whether the interface is active, otherwise batman_if->net_dev might not be
available ...

Signed-off-by: Simon Wunderlich <siwu@…>
Acked-by: Marek Lindner <lindner_marek@…>

Files:

• trunk/batman-adv-kernelland/device.c (modified) (4 diffs)

trunk/batman-adv-kernelland/device.c

@@ -26 +26 @@
 #include "types.h"
 #include "hash.h"
+#include "hard-interface.h"
 
 #include "compat.h"
@@ -209 +210 @@
         struct orig_node *orig_node;
         struct batman_if *batman_if;
+        uint8_t dstaddr[ETH_ALEN];
         unsigned long flags;
 
@@ -254 +256 @@
 
         batman_if = orig_node->batman_if;
+        memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
+
+        spin_unlock_irqrestore(&orig_hash_lock, flags);
 
         if (!batman_if)
-                goto unlock;
+                goto dst_unreach;
+
+        if (batman_if->if_active != IF_ACTIVE)
+                goto dst_unreach;
 
         memcpy(icmp_packet.orig,
@@ -264 +272 @@
         send_raw_packet((unsigned char *)&icmp_packet,
                         sizeof(struct icmp_packet),
-                        batman_if, orig_node->router->addr);
-
-        spin_unlock_irqrestore(&orig_hash_lock, flags);
+                        batman_if, dstaddr);
+
         goto out;