Here are two batman-adv bugfix patches:
- Fix reference counting for last_bonding_candidate, by Sven Eckelmann - Fix head room reservation for ELP packets, by Linus Luessing -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdBQJX2UCwFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS nqHp+w/+MGG87sjUfObJKrSTmsIDgWHl2VSQwKBivbkvIuBm9gxIhFblaBQEJd5A 88Z5LOGWpnxh2rfFIPurTLxkYAZyARpIxWOLVtmPE3TdfMi4savTsvkOywd0ZHqE kXZH1QHE/Y3CQBf9FaM5cgTiwAXjZ+KWr5kRg3WNmH0oQUepndUBb5AAbjpD2G3f Gt4TsfunplXCmA/5uJMISOjKiub8usUhXVXBHVpxR+ZItdoIolwN197wDzXT8pWK FJe+Flqrvxi3n0kNFknUzCDdt09TFLms4m0AEu+8f4P6t1mR7v+YHNM4IlBx8BX0 6Kwiz009h9+5JFZvOSTCy6tkrodn5cAk9LNNsam5uPTWXeY76gFOzegdHIcIaBxq MLEqnTUgONqOakZs+4NopUz0HUvtJXDGYJcy7SDLYIYEwhaHP7seyuPkjA+xap2p uPZR3dTYESdeNGs/uPTEGVh1q8w6xXqXe9IRzP1KvGAOsg5IXCboLvJHpVMc25aT 4CT9qz5H94sVqdR6d5pBb+0CLoxnhbl+4IjKnHwMBzVM/0LVDJZRmx9qgiNHJ+0f PGQeQEbAfrihORRn2jCEq0YLCHKhjvLw9O7GVj353wmiVkvvuR+MQEv+bcDgu0DE mH9maOpcOahud6S+x+m9of3f3ytwWR4UO2Qk5t1RdIuVRSD7sXM= =mHPX -----END PGP SIGNATURE----- Merge tag 'batadv-net-for-davem-20160914' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== Here are two batman-adv bugfix patches: - Fix reference counting for last_bonding_candidate, by Sven Eckelmann - Fix head room reservation for ELP packets, by Linus Luessing ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
6777ae8083
|
@ -335,7 +335,7 @@ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface)
|
|||
goto out;
|
||||
|
||||
skb_reserve(hard_iface->bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN);
|
||||
elp_buff = skb_push(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN);
|
||||
elp_buff = skb_put(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN);
|
||||
elp_packet = (struct batadv_elp_packet *)elp_buff;
|
||||
memset(elp_packet, 0, BATADV_ELP_HLEN);
|
||||
|
||||
|
|
|
@ -469,6 +469,29 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_last_bonding_get - Get last_bonding_candidate of orig_node
|
||||
* @orig_node: originator node whose last bonding candidate should be retrieved
|
||||
*
|
||||
* Return: last bonding candidate of router or NULL if not found
|
||||
*
|
||||
* The object is returned with refcounter increased by 1.
|
||||
*/
|
||||
static struct batadv_orig_ifinfo *
|
||||
batadv_last_bonding_get(struct batadv_orig_node *orig_node)
|
||||
{
|
||||
struct batadv_orig_ifinfo *last_bonding_candidate;
|
||||
|
||||
spin_lock_bh(&orig_node->neigh_list_lock);
|
||||
last_bonding_candidate = orig_node->last_bonding_candidate;
|
||||
|
||||
if (last_bonding_candidate)
|
||||
kref_get(&last_bonding_candidate->refcount);
|
||||
spin_unlock_bh(&orig_node->neigh_list_lock);
|
||||
|
||||
return last_bonding_candidate;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_last_bonding_replace - Replace last_bonding_candidate of orig_node
|
||||
* @orig_node: originator node whose bonding candidates should be replaced
|
||||
|
@ -539,7 +562,7 @@ batadv_find_router(struct batadv_priv *bat_priv,
|
|||
* router - obviously there are no other candidates.
|
||||
*/
|
||||
rcu_read_lock();
|
||||
last_candidate = orig_node->last_bonding_candidate;
|
||||
last_candidate = batadv_last_bonding_get(orig_node);
|
||||
if (last_candidate)
|
||||
last_cand_router = rcu_dereference(last_candidate->router);
|
||||
|
||||
|
@ -631,6 +654,9 @@ next:
|
|||
batadv_orig_ifinfo_put(next_candidate);
|
||||
}
|
||||
|
||||
if (last_candidate)
|
||||
batadv_orig_ifinfo_put(last_candidate);
|
||||
|
||||
return router;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue