|
@@ -364,7 +364,7 @@ struct batadv_orig_ifinfo *
|
|
batadv_orig_ifinfo_new(struct batadv_orig_node *orig_node,
|
|
batadv_orig_ifinfo_new(struct batadv_orig_node *orig_node,
|
|
struct batadv_hard_iface *if_outgoing)
|
|
struct batadv_hard_iface *if_outgoing)
|
|
{
|
|
{
|
|
- struct batadv_orig_ifinfo *orig_ifinfo = NULL;
|
|
|
|
|
|
+ struct batadv_orig_ifinfo *orig_ifinfo;
|
|
unsigned long reset_time;
|
|
unsigned long reset_time;
|
|
|
|
|
|
spin_lock_bh(&orig_node->neigh_list_lock);
|
|
spin_lock_bh(&orig_node->neigh_list_lock);
|
|
@@ -520,7 +520,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,
|
|
const u8 *neigh_addr)
|
|
const u8 *neigh_addr)
|
|
{
|
|
{
|
|
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
|
|
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
|
|
- struct batadv_hardif_neigh_node *hardif_neigh = NULL;
|
|
|
|
|
|
+ struct batadv_hardif_neigh_node *hardif_neigh;
|
|
|
|
|
|
spin_lock_bh(&hard_iface->neigh_list_lock);
|
|
spin_lock_bh(&hard_iface->neigh_list_lock);
|
|
|
|
|
|
@@ -563,7 +563,7 @@ static struct batadv_hardif_neigh_node *
|
|
batadv_hardif_neigh_get_or_create(struct batadv_hard_iface *hard_iface,
|
|
batadv_hardif_neigh_get_or_create(struct batadv_hard_iface *hard_iface,
|
|
const u8 *neigh_addr)
|
|
const u8 *neigh_addr)
|
|
{
|
|
{
|
|
- struct batadv_hardif_neigh_node *hardif_neigh = NULL;
|
|
|
|
|
|
+ struct batadv_hardif_neigh_node *hardif_neigh;
|
|
|
|
|
|
/* first check without locking to avoid the overhead */
|
|
/* first check without locking to avoid the overhead */
|
|
hardif_neigh = batadv_hardif_neigh_get(hard_iface, neigh_addr);
|
|
hardif_neigh = batadv_hardif_neigh_get(hard_iface, neigh_addr);
|
|
@@ -683,7 +683,7 @@ batadv_neigh_node_get_or_create(struct batadv_orig_node *orig_node,
|
|
struct batadv_hard_iface *hard_iface,
|
|
struct batadv_hard_iface *hard_iface,
|
|
const u8 *neigh_addr)
|
|
const u8 *neigh_addr)
|
|
{
|
|
{
|
|
- struct batadv_neigh_node *neigh_node = NULL;
|
|
|
|
|
|
+ struct batadv_neigh_node *neigh_node;
|
|
|
|
|
|
/* first check without locking to avoid the overhead */
|
|
/* first check without locking to avoid the overhead */
|
|
neigh_node = batadv_neigh_node_get(orig_node, hard_iface, neigh_addr);
|
|
neigh_node = batadv_neigh_node_get(orig_node, hard_iface, neigh_addr);
|