Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[~andy/linux] / net / batman-adv / send.c

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 4425af9dad40e2b9698f48c576c27042c13a8dbb..a67cffde37ae62c4bcc5ae2833bd0634e4daa3f0 100644 (file)
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -155,8 +155,6 @@ _batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
        spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
 
        /* start timer for this packet */
-       INIT_DELAYED_WORK(&forw_packet->delayed_work,
-                         batadv_send_outstanding_bcast_packet);
        queue_delayed_work(batadv_event_workqueue, &forw_packet->delayed_work,
                           send_time);
 }
@@ -210,6 +208,9 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
        /* how often did we send the bcast packet ? */
        forw_packet->num_packets = 0;
 
+       INIT_DELAYED_WORK(&forw_packet->delayed_work,
+                         batadv_send_outstanding_bcast_packet);
+
        _batadv_add_bcast_packet_to_list(bat_priv, forw_packet, delay);
        return NETDEV_TX_OK;
 
@@ -315,7 +316,7 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
                                 const struct batadv_hard_iface *hard_iface)
 {
        struct batadv_forw_packet *forw_packet;
-       struct hlist_node *tmp_node, *safe_tmp_node;
+       struct hlist_node *safe_tmp_node;
        bool pending;
 
        if (hard_iface)
@@ -328,9 +329,8 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
 
        /* free bcast list */
        spin_lock_bh(&bat_priv->forw_bcast_list_lock);
-       hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
+       hlist_for_each_entry_safe(forw_packet, safe_tmp_node,
                                  &bat_priv->forw_bcast_list, list) {
-
                /* if purge_outstanding_packets() was called with an argument
                 * we delete only packets belonging to the given interface
                 */
@@ -355,9 +355,8 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
 
        /* free batman packet list */
        spin_lock_bh(&bat_priv->forw_bat_list_lock);
-       hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
+       hlist_for_each_entry_safe(forw_packet, safe_tmp_node,
                                  &bat_priv->forw_bat_list, list) {
-
                /* if purge_outstanding_packets() was called with an argument
                 * we delete only packets belonging to the given interface
                 */