Staging: batman-adv: Reduce max characters on a line to 80

[safe/jmp/linux-2.6] / drivers / staging / batman-adv / soft-interface.c

diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c
index c3b5288..51c40b7 100644 (file)
--- a/drivers/staging/batman-adv/soft-interface.c
+++ b/drivers/staging/batman-adv/soft-interface.c
@@ -237,6 +237,8 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev)
 
                if ((orig_node) &&
                    (orig_node->router)) {
+                       struct neigh_node *router = orig_node->router;
+
                        if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0)
                                goto unlock;
 
@@ -251,14 +253,14 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev)
                        memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
 
                        /* net_dev won't be available when not active */
-                       if (orig_node->router->if_incoming->if_status != IF_ACTIVE)
+                       if (router->if_incoming->if_status != IF_ACTIVE)
                                goto unlock;
 
                        /* don't lock while sending the packets ... we therefore
                         * copy the required data before sending */
 
-                       batman_if = orig_node->router->if_incoming;
-                       memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
+                       batman_if = router->if_incoming;
+                       memcpy(dstaddr, router->addr, ETH_ALEN);
                        spin_unlock_irqrestore(&orig_hash_lock, flags);
 
                        send_skb_packet(skb, batman_if, dstaddr);