The following commit has been merged in the maint branch: commit de1d5d4bc28c18d0652345845648125531d754c8 Author: Sven Eckelmann sven@narfation.org Date: Tue Feb 8 12:43:54 2011 +0000

batman-adv: Split combined variable declarations

Multiple variable declarations in a single statements over multiple lines can be split into multiple variable declarations without changing the actual behavior.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/unicast.c b/unicast.c index d8d079f..6fc7825 100644 --- a/unicast.c +++ b/unicast.c @@ -39,8 +39,8 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, (struct unicast_frag_packet *)skb->data; struct sk_buff *tmp_skb; struct unicast_packet *unicast_packet; - int hdr_len = sizeof(struct unicast_packet), - uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; + int hdr_len = sizeof(struct unicast_packet); + int uni_diff = sizeof(struct unicast_frag_packet) - hdr_len;

/* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) {