Staging: batman-adv: remove redundant pointer to originator interface

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c
index 9887f05925e1ee1113049ae50c65e0927427e9e7..c419c62bf7dd1218f6252031a0ed762a013b5f71 100644 (file)
--- a/drivers/staging/batman-adv/device.c
+++ b/drivers/staging/batman-adv/device.c
@@ -250,7 +250,7 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
        if (!orig_node->router)
                goto unlock;
 
-       batman_if = orig_node->batman_if;
+       batman_if = orig_node->router->if_incoming;
        memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
 
        spin_unlock_irqrestore(&orig_hash_lock, flags);

diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
index 684db750cf16a1950bb3765156f0655c2a855312..4152701c36891a0f96f4dbbe3c15b17590da3764 100644 (file)
--- a/drivers/staging/batman-adv/originator.c
+++ b/drivers/staging/batman-adv/originator.c
@@ -137,7 +137,6 @@ struct orig_node *get_orig_node(uint8_t *addr)
 
        memcpy(orig_node->orig, addr, ETH_ALEN);
        orig_node->router = NULL;
-       orig_node->batman_if = NULL;
        orig_node->hna_buff = NULL;
 
        size = num_ifs * sizeof(TYPE_OF_WORD) * NUM_WORDS;

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index 8c055a124cf23368efdf6fc01417a5a2855ff067..0a9f52b8d35d21fb9b0e2bd67be4d3fd4d936916 100644 (file)
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
@@ -97,11 +97,6 @@ static void update_route(struct orig_node *orig_node,
                bat_dbg(DBG_ROUTES, "Changing route towards: %pM (now via %pM - was via %pM)\n", orig_node->orig, neigh_node->addr, orig_node->router->addr);
        }
 
-       if (neigh_node != NULL)
-               orig_node->batman_if = neigh_node->if_incoming;
-       else
-               orig_node->batman_if = NULL;
-
        orig_node->router = neigh_node;
 }
 
@@ -616,12 +611,11 @@ static int recv_my_icmp_packet(struct sk_buff *skb)
        ret = NET_RX_DROP;
 
        if ((orig_node != NULL) &&
-           (orig_node->batman_if != NULL) &&
            (orig_node->router != NULL)) {
 
                /* don't lock while sending the packets ... we therefore
                 * copy the required data before sending */
-               batman_if = orig_node->batman_if;
+               batman_if = orig_node->router->if_incoming;
                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
                spin_unlock_irqrestore(&orig_hash_lock, flags);
 
@@ -678,12 +672,11 @@ static int recv_icmp_ttl_exceeded(struct sk_buff *skb)
        ret = NET_RX_DROP;
 
        if ((orig_node != NULL) &&
-           (orig_node->batman_if != NULL) &&
            (orig_node->router != NULL)) {
 
                /* don't lock while sending the packets ... we therefore
                 * copy the required data before sending */
-               batman_if = orig_node->batman_if;
+               batman_if = orig_node->router->if_incoming;
                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
                spin_unlock_irqrestore(&orig_hash_lock, flags);
 
@@ -760,12 +753,11 @@ int recv_icmp_packet(struct sk_buff *skb)
                     hash_find(orig_hash, icmp_packet->dst));
 
        if ((orig_node != NULL) &&
-           (orig_node->batman_if != NULL) &&
            (orig_node->router != NULL)) {
 
                /* don't lock while sending the packets ... we therefore
                 * copy the required data before sending */
-               batman_if = orig_node->batman_if;
+               batman_if = orig_node->router->if_incoming;
                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
                spin_unlock_irqrestore(&orig_hash_lock, flags);
 
@@ -844,12 +836,11 @@ int recv_unicast_packet(struct sk_buff *skb)
                     hash_find(orig_hash, unicast_packet->dest));
 
        if ((orig_node != NULL) &&
-           (orig_node->batman_if != NULL) &&
            (orig_node->router != NULL)) {
 
                /* don't lock while sending the packets ... we therefore
                 * copy the required data before sending */
-               batman_if = orig_node->batman_if;
+               batman_if = orig_node->router->if_incoming;
                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
                spin_unlock_irqrestore(&orig_hash_lock, flags);
 

diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c
index 829deb694b84ee8af48c8aabafc5b0bc4b7559e1..4cdebe5f874fabc609ea307946df4d4e34d151f7 100644 (file)
--- a/drivers/staging/batman-adv/soft-interface.c
+++ b/drivers/staging/batman-adv/soft-interface.c
@@ -236,7 +236,6 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev)
                        orig_node = transtable_search(ethhdr->h_dest);
 
                if ((orig_node) &&
-                   (orig_node->batman_if) &&
                    (orig_node->router)) {
                        if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0)
                                goto unlock;
@@ -252,13 +251,13 @@ 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->batman_if->if_active != IF_ACTIVE)
+                       if (orig_node->router->if_incoming->if_active != IF_ACTIVE)
                                goto unlock;
 
                        /* don't lock while sending the packets ... we therefore
                         * copy the required data before sending */
 
-                       batman_if = orig_node->batman_if;
+                       batman_if = orig_node->router->if_incoming;
                        memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
                        spin_unlock_irqrestore(&orig_hash_lock, flags);
 

diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index a8c6ad776df631c6089550203e49f88ae419ddf4..ffaa16c30af620fe1bbf392093eb9d02fbdceac2 100644 (file)
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/types.h
@@ -49,7 +49,6 @@ struct batman_if {
 struct orig_node {               /* structure for orig_list maintaining nodes of mesh */
        uint8_t orig[ETH_ALEN];
        struct neigh_node *router;
-       struct batman_if *batman_if;
        TYPE_OF_WORD *bcast_own;
        uint8_t *bcast_own_sum;
        uint8_t tq_own;

diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c
index 5edeb3261ac10f8ba36d824e557947c892a58704..57d69d70671e1259438a875220a47158b9aa352f 100644 (file)
--- a/drivers/staging/batman-adv/vis.c
+++ b/drivers/staging/batman-adv/vis.c
@@ -498,14 +498,14 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
                if (orig_node->router != NULL
                        && compare_orig(orig_node->router->addr,
                                        orig_node->orig)
-                       && orig_node->batman_if
-                       && (orig_node->batman_if->if_active == IF_ACTIVE)
+                       && (orig_node->router->if_incoming->if_active ==
+                                                               IF_ACTIVE)
                    && orig_node->router->tq_avg > 0) {
 
                        /* fill one entry into buffer. */
                        entry = &entry_array[info->packet.entries];
                        memcpy(entry->src,
-                              orig_node->batman_if->net_dev->dev_addr,
+                            orig_node->router->if_incoming->net_dev->dev_addr,
                               ETH_ALEN);
                        memcpy(entry->dest, orig_node->orig, ETH_ALEN);
                        entry->quality = orig_node->router->tq_avg;
@@ -573,8 +573,7 @@ static void broadcast_vis_packet(struct vis_info *info, int packet_length)
                orig_node = hashit.bucket->data;
 
                /* if it's a vis server and reachable, send it. */
-               if ((!orig_node) || (!orig_node->batman_if) ||
-                   (!orig_node->router))
+               if ((!orig_node) || (!orig_node->router))
                        continue;
                if (!(orig_node->flags & VIS_SERVER))
                        continue;
@@ -584,7 +583,7 @@ static void broadcast_vis_packet(struct vis_info *info, int packet_length)
                        continue;
 
                memcpy(info->packet.target_orig, orig_node->orig, ETH_ALEN);
-               batman_if = orig_node->batman_if;
+               batman_if = orig_node->router->if_incoming;
                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
                spin_unlock_irqrestore(&orig_hash_lock, flags);
 
@@ -609,12 +608,12 @@ static void unicast_vis_packet(struct vis_info *info, int packet_length)
        orig_node = ((struct orig_node *)
                     hash_find(orig_hash, info->packet.target_orig));
 
-       if ((!orig_node) || (!orig_node->batman_if) || (!orig_node->router))
+       if ((!orig_node) || (!orig_node->router))
                goto out;
 
        /* don't lock while sending the packets ... we therefore
         * copy the required data before sending */
-       batman_if = orig_node->batman_if;
+       batman_if = orig_node->router->if_incoming;
        memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
        spin_unlock_irqrestore(&orig_hash_lock, flags);