[batman-adv] master: batman-adv: replace redudant primary_if_get calls (8d58064) - commits - lists.open-mesh.org

27 Jan 2013

Repository : ssh://git@open-mesh.org/batman-adv
On branch  : master
...

commit 8d58064e5e3420e86de6d10d6956c1e4c34f4ea9
Author: Marek Lindner lindner_marek@yahoo.de
Date:   Sat Jan 12 19:19:06 2013 +0800
batman-adv: replace redudant primary_if_get calls
The batadv_priv struct carries a pointer to its own interface
    struct. Therefore, it is not necessary to retrieve the soft_iface
    via the primary interface.
Signed-off-by: Marek Lindner lindner_marek@yahoo.de
...

8d58064e5e3420e86de6d10d6956c1e4c34f4ea9
 distributed-arp-table.c |   22 ++++------------------
 sysfs.c                 |   10 +---------
 translation-table.c     |   25 ++++++-------------------
 3 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/distributed-arp-table.c b/distributed-arp-table.c
index ea0bd31..c19e60f 100644
--- a/distributed-arp-table.c
+++ b/distributed-arp-table.c
@@ -819,7 +819,6 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
    bool ret = false;
    struct batadv_dat_entry *dat_entry = NULL;
    struct sk_buff *skb_new;
-	struct batadv_hard_iface *primary_if = NULL;
if (!atomic_read(&bat_priv->distributed_arp_table))
    	goto out;
@@ -841,22 +840,18 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst);
    if (dat_entry) {
-		primary_if = batadv_primary_if_get_selected(bat_priv);
-		if (!primary_if)
-			goto out;
-
    	skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src,
-				     primary_if->soft_iface, ip_dst, hw_src,
+				     bat_priv->soft_iface, ip_dst, hw_src,
    			     dat_entry->mac_addr, hw_src);
    	if (!skb_new)
    		goto out;
skb_reset_mac_header(skb_new);
    	skb_new->protocol = eth_type_trans(skb_new,
-						   primary_if->soft_iface);
+						   bat_priv->soft_iface);
    	bat_priv->stats.rx_packets++;
    	bat_priv->stats.rx_bytes += skb->len + ETH_HLEN;
-		primary_if->soft_iface->last_rx = jiffies;
+		bat_priv->soft_iface->last_rx = jiffies;
netif_rx(skb_new);
    	batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n");
@@ -869,8 +864,6 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
 out:
    if (dat_entry)
    	batadv_dat_entry_free_ref(dat_entry);
-	if (primary_if)
-		batadv_hardif_free_ref(primary_if);
    return ret;
 }
@@ -890,7 +883,6 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
    __be32 ip_src, ip_dst;
    uint8_t *hw_src;
    struct sk_buff *skb_new;
-	struct batadv_hard_iface *primary_if = NULL;
    struct batadv_dat_entry *dat_entry = NULL;
    bool ret = false;
    int err;
@@ -915,12 +907,8 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
    if (!dat_entry)
    	goto out;
-	primary_if = batadv_primary_if_get_selected(bat_priv);
-	if (!primary_if)
-		goto out;
-
    skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src,
-			     primary_if->soft_iface, ip_dst, hw_src,
+			     bat_priv->soft_iface, ip_dst, hw_src,
    		     dat_entry->mac_addr, hw_src);
if (!skb_new)
@@ -944,8 +932,6 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
 out:
    if (dat_entry)
    	batadv_dat_entry_free_ref(dat_entry);
-	if (primary_if)
-		batadv_hardif_free_ref(primary_if);
    if (ret)
    	kfree_skb(skb);
    return ret;
diff --git a/sysfs.c b/sysfs.c
index afbba31..6a44fed 100644
--- a/sysfs.c
+++ b/sysfs.c
@@ -688,15 +688,10 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
    		enum batadv_uev_action action, const char *data)
 {
    int ret = -ENOMEM;
-	struct batadv_hard_iface *primary_if;
    struct kobject *bat_kobj;
    char *uevent_env[4] = { NULL, NULL, NULL, NULL };
-	primary_if = batadv_primary_if_get_selected(bat_priv);
-	if (!primary_if)
-		goto out;
-
-	bat_kobj = &primary_if->soft_iface->dev.kobj;
+	bat_kobj = &bat_priv->soft_iface->dev.kobj;
uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) +
    			strlen(batadv_uev_type_str[type]) + 1,
@@ -732,9 +727,6 @@ out:
    kfree(uevent_env[1]);
    kfree(uevent_env[2]);
-	if (primary_if)
-		batadv_hardif_free_ref(primary_if);
-
    if (ret)
    	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
    		   "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
diff --git a/translation-table.c b/translation-table.c
index fb15b4c..607fd3c 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -387,25 +387,19 @@ static void batadv_tt_prepare_packet_buff(struct batadv_priv *bat_priv,
    				  int *packet_buff_len,
    				  int min_packet_len)
 {
-	struct batadv_hard_iface *primary_if;
    int req_len;
-	primary_if = batadv_primary_if_get_selected(bat_priv);
-
    req_len = min_packet_len;
    req_len += batadv_tt_len(atomic_read(&bat_priv->tt.local_changes));
/* if we have too many changes for one packet don't send any
     * and wait for the tt table request which will be fragmented
     */
-	if ((!primary_if) || (req_len > primary_if->soft_iface->mtu))
+	if (req_len > bat_priv->soft_iface->mtu)
    	req_len = min_packet_len;
batadv_tt_realloc_packet_buff(packet_buff, packet_buff_len,
    			      min_packet_len, req_len);
-
-	if (primary_if)
-		batadv_hardif_free_ref(primary_if);
 }
static int batadv_tt_changes_fill_buff(struct batadv_priv *bat_priv,
@@ -1590,7 +1584,7 @@ static int batadv_tt_global_valid(const void *entry_ptr,
 static struct sk_buff *
 batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
    		      struct batadv_hashtable *hash,
-			      struct batadv_hard_iface *primary_if,
+			      struct batadv_priv *bat_priv,
    		      int (*valid_cb)(const void *, const void *),
    		      void *cb_data)
 {
@@ -1605,8 +1599,8 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
    uint32_t i;
    size_t len;
-	if (tt_query_size + tt_len > primary_if->soft_iface->mtu) {
-		tt_len = primary_if->soft_iface->mtu - tt_query_size;
+	if (tt_query_size + tt_len > bat_priv->soft_iface->mtu) {
+		tt_len = bat_priv->soft_iface->mtu - tt_query_size;
    	tt_len -= tt_len % sizeof(struct batadv_tt_change);
    }
    tt_tot = tt_len / sizeof(struct batadv_tt_change);
@@ -1726,7 +1720,6 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv,
 {
    struct batadv_orig_node *req_dst_orig_node;
    struct batadv_orig_node *res_dst_orig_node = NULL;
-	struct batadv_hard_iface *primary_if = NULL;
    uint8_t orig_ttvn, req_ttvn, ttvn;
    int ret = false;
    unsigned char *tt_buff;
@@ -1751,10 +1744,6 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv,
    if (!res_dst_orig_node)
    	goto out;
-	primary_if = batadv_primary_if_get_selected(bat_priv);
-	if (!primary_if)
-		goto out;
-
    orig_ttvn = (uint8_t)atomic_read(&req_dst_orig_node->last_ttvn);
    req_ttvn = tt_request->ttvn;
@@ -1802,7 +1791,7 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv,
skb = batadv_tt_response_fill_table(tt_len, ttvn,
    					    bat_priv->tt.global_hash,
-						    primary_if,
+						    bat_priv,
    					    batadv_tt_global_valid,
    					    req_dst_orig_node);
    	if (!skb)
@@ -1839,8 +1828,6 @@ out:
    	batadv_orig_node_free_ref(res_dst_orig_node);
    if (req_dst_orig_node)
    	batadv_orig_node_free_ref(req_dst_orig_node);
-	if (primary_if)
-		batadv_hardif_free_ref(primary_if);
    if (!ret)
    	kfree_skb(skb);
    return ret;
@@ -1918,7 +1905,7 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv,
skb = batadv_tt_response_fill_table(tt_len, ttvn,
    					    bat_priv->tt.local_hash,
-						    primary_if,
+						    bat_priv,
    					    batadv_tt_local_valid_entry,
    					    NULL);
    	if (!skb)

    