[linux-next] LinuxNextTracking branch, master, updated. next-20130531

batman at open-mesh.org batman at open-mesh.org
Sat Jun 1 00:18:29 CEST 2013

The following commit has been merged in the master branch:
commit e54c77f08ec62434ac8b24e402aa7b787cf42198
Author: Linus Lüssing <linus.luessing at web.de>
Date:   Fri Apr 19 12:06:56 2013 +0200

    batman-adv: Remove unnecessary INIT_HLIST_NODE() calls
    There's no need to for an explicit hlist_node initialization if it is
    added to a list right away, like it's the case with the
    hlist_add_head()s here.
    Signed-off-by: Linus Lüssing <linus.luessing at web.de>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 5b0a043..d07323b 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -464,8 +464,6 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,
 	skb_reserve(forw_packet_aggr->skb, ETH_HLEN);
-	INIT_HLIST_NODE(&forw_packet_aggr->list);
 	skb_buff = skb_put(forw_packet_aggr->skb, packet_len);
 	forw_packet_aggr->packet_len = packet_len;
 	memcpy(skb_buff, packet_buff, packet_len);
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index ed7072a..ce69f45 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -152,8 +152,6 @@ _batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
 				 struct batadv_forw_packet *forw_packet,
 				 unsigned long send_time)
-	INIT_HLIST_NODE(&forw_packet->list);
 	/* add new packet to packet list */
 	hlist_add_head(&forw_packet->list, &bat_priv->forw_bcast_list);


More information about the linux-merge mailing list