Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block

[mv-sheeva.git] / net / batman-adv / unicast.c

diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 32b125fb3d3b65ce07d7b83ad5b574257b0cd250..07d1c1da89dde625a7c42a64ba0f5fa5694b491c 100644 (file)
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -299,8 +299,10 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
                        goto find_router;
        }
 
-       /* check for tt host - increases orig_node refcount */
-       orig_node = transtable_search(bat_priv, ethhdr->h_dest);
+       /* check for tt host - increases orig_node refcount.
+        * returns NULL in case of AP isolation */
+       orig_node = transtable_search(bat_priv, ethhdr->h_source,
+                                     ethhdr->h_dest);
 
 find_router:
        /**