From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sven Eckelmann Date: Fri, 17 Apr 2015 18:34:21 +0200 Message-Id: <1429288461-26260-6-git-send-email-sven@narfation.org> In-Reply-To: <1429288461-26260-1-git-send-email-sven@narfation.org> References: <13114664.Eg4ODy7KEo@bentobox> <1429288461-26260-1-git-send-email-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH-next 6/6] batman-adv: Use kernel variable declaration order in batadv_send_skb_unicast Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: b.a.t.m.a.n@lists.open-mesh.org The patches currently in the kernel for Linux 4.1 have a different variable order in batadv_send_skb_unicast than the out-of-tree module. Fix the order in the out-of-tree module because it is easier to get merged. Signed-off-by: Sven Eckelmann --- send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/send.c b/send.c index d27161e..3d64ed2 100644 --- a/send.c +++ b/send.c @@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { - struct batadv_unicast_packet *unicast_packet; struct ethhdr *ethhdr; + struct batadv_unicast_packet *unicast_packet; int ret = NET_XMIT_DROP; if (!orig_node) -- 2.1.4