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

batman at open-mesh.org batman at open-mesh.org
Sat Nov 10 00:18:23 CET 2012

The following commit has been merged in the master branch:
commit 9affec6be810d1d529cb9dc95126119451696ba6
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Sun Oct 14 17:19:19 2012 +0200

    batman-adv: enable fast client detection using unicast_4addr packets
    The "early client detection mechanism" can be extended to find new clients by
    means of unicast_4addr packets.
    The unicast_4addr packet contains as well as the broadcast packet (which is
    currently used in this mechanism) the address of the originating node and can
    therefore be used to install new entries in the Global Translation Table
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 3f21c09..32aa4d4 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -986,6 +986,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
 	struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
 	struct batadv_unicast_packet *unicast_packet;
 	struct batadv_unicast_4addr_packet *unicast_4addr_packet;
+	uint8_t *orig_addr;
+	struct batadv_orig_node *orig_node = NULL;
 	int hdr_size = sizeof(*unicast_packet);
 	bool is4addr;
@@ -1005,9 +1007,12 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
 	/* packet for me */
 	if (batadv_is_my_mac(unicast_packet->dest)) {
-		if (is4addr)
+		if (is4addr) {
+			orig_addr = unicast_4addr_packet->src;
+			orig_node = batadv_orig_hash_find(bat_priv, orig_addr);
+		}
 		if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb,
@@ -1017,9 +1022,12 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
 			goto rx_success;
 		batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size,
-				    NULL);
+				    orig_node);
+		if (orig_node)
+			batadv_orig_node_free_ref(orig_node);
 		return NET_RX_SUCCESS;


More information about the linux-merge mailing list