leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

batman-adv: refactor code to simplify long lines

Browse Source 
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
This commit is contained in:
Antonio Quartulli 2012-09-23 22:38:35 +02:00
parent 7c1fd91da5
commit 47c94655c3
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
net/batman-adv/translation-table.c
View File

@ -242,86 +242,84 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
int ifindex) int ifindex)
{ {
struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_priv *bat_priv = netdev_priv(soft_iface);
struct batadv_tt_local_entry *tt_local_entry = NULL; struct batadv_tt_local_entry *tt_local = NULL;
struct batadv_tt_global_entry *tt_global_entry = NULL; struct batadv_tt_global_entry *tt_global = NULL;
struct hlist_head *head; struct hlist_head *head;
struct hlist_node *node; struct hlist_node *node;
struct batadv_tt_orig_list_entry *orig_entry; struct batadv_tt_orig_list_entry *orig_entry;
int hash_added; int hash_added;
tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); tt_local = batadv_tt_local_hash_find(bat_priv, addr);
if (tt_local_entry) { if (tt_local) {
tt_local_entry->last_seen = jiffies; tt_local->last_seen = jiffies;
/* possibly unset the BATADV_TT_CLIENT_PENDING flag */ /* possibly unset the BATADV_TT_CLIENT_PENDING flag */
tt_local_entry->common.flags &= ~BATADV_TT_CLIENT_PENDING; tt_local->common.flags &= ~BATADV_TT_CLIENT_PENDING;
goto out; goto out;
} }
tt_local_entry = kmalloc(sizeof(*tt_local_entry), GFP_ATOMIC); tt_local = kmalloc(sizeof(*tt_local), GFP_ATOMIC);
if (!tt_local_entry) if (!tt_local)
goto out; goto out;
batadv_dbg(BATADV_DBG_TT, bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv,
"Creating new local tt entry: %pM (ttvn: %d)\n", addr, "Creating new local tt entry: %pM (ttvn: %d)\n", addr,
(uint8_t)atomic_read(&bat_priv->tt.vn)); (uint8_t)atomic_read(&bat_priv->tt.vn));
memcpy(tt_local_entry->common.addr, addr, ETH_ALEN); memcpy(tt_local->common.addr, addr, ETH_ALEN);
tt_local_entry->common.flags = BATADV_NO_FLAGS; tt_local->common.flags = BATADV_NO_FLAGS;
if (batadv_is_wifi_iface(ifindex)) if (batadv_is_wifi_iface(ifindex))
tt_local_entry->common.flags |= BATADV_TT_CLIENT_WIFI; tt_local->common.flags |= BATADV_TT_CLIENT_WIFI;
atomic_set(&tt_local_entry->common.refcount, 2); atomic_set(&tt_local->common.refcount, 2);
tt_local_entry->last_seen = jiffies; tt_local->last_seen = jiffies;
tt_local_entry->common.added_at = tt_local_entry->last_seen; tt_local->common.added_at = tt_local->last_seen;
/* the batman interface mac address should never be purged */ /* the batman interface mac address should never be purged */
if (batadv_compare_eth(addr, soft_iface->dev_addr)) if (batadv_compare_eth(addr, soft_iface->dev_addr))
tt_local_entry->common.flags |= BATADV_TT_CLIENT_NOPURGE; tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE;
/* The local entry has to be marked as NEW to avoid to send it in /* The local entry has to be marked as NEW to avoid to send it in
* a full table response going out before the next ttvn increment * a full table response going out before the next ttvn increment
* (consistency check) * (consistency check)
*/ */
tt_local_entry->common.flags |= BATADV_TT_CLIENT_NEW; tt_local->common.flags |= BATADV_TT_CLIENT_NEW;
hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt,
batadv_choose_orig, batadv_choose_orig, &tt_local->common,
&tt_local_entry->common, &tt_local->common.hash_entry);
&tt_local_entry->common.hash_entry);
if (unlikely(hash_added != 0)) { if (unlikely(hash_added != 0)) {
/* remove the reference for the hash */ /* remove the reference for the hash */
batadv_tt_local_entry_free_ref(tt_local_entry); batadv_tt_local_entry_free_ref(tt_local);
goto out; goto out;
} }
batadv_tt_local_event(bat_priv, addr, tt_local_entry->common.flags); batadv_tt_local_event(bat_priv, addr, tt_local->common.flags);
/* remove address from global hash if present */ /* remove address from global hash if present */
tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr); tt_global = batadv_tt_global_hash_find(bat_priv, addr);
/* Check whether it is a roaming! */ /* Check whether it is a roaming! */
if (tt_global_entry) { if (tt_global) {
/* These node are probably going to update their tt table */ /* These node are probably going to update their tt table */
head = &tt_global_entry->orig_list; head = &tt_global->orig_list;
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(orig_entry, node, head, list) { hlist_for_each_entry_rcu(orig_entry, node, head, list) {
batadv_send_roam_adv(bat_priv, batadv_send_roam_adv(bat_priv, tt_global->common.addr,
tt_global_entry->common.addr,
orig_entry->orig_node); orig_entry->orig_node);
} }
rcu_read_unlock(); rcu_read_unlock();
/* The global entry has to be marked as ROAMING and /* The global entry has to be marked as ROAMING and
* has to be kept for consistency purpose * has to be kept for consistency purpose
*/ */
tt_global_entry->common.flags |= BATADV_TT_CLIENT_ROAM; tt_global->common.flags |= BATADV_TT_CLIENT_ROAM;
tt_global_entry->roam_at = jiffies; tt_global->roam_at = jiffies;
} }
out: out:
if (tt_local_entry) if (tt_local)
batadv_tt_local_entry_free_ref(tt_local_entry); batadv_tt_local_entry_free_ref(tt_local);
if (tt_global_entry) if (tt_global)
batadv_tt_global_entry_free_ref(tt_global_entry); batadv_tt_global_entry_free_ref(tt_global);
} }
static void batadv_tt_realloc_packet_buff(unsigned char **packet_buff, static void batadv_tt_realloc_packet_buff(unsigned char **packet_buff,