While resolving a merge conflict a variable declaration was accidentally moved onto another line. Move it back to its original location to avoid messing up with the in-kernel source code.
Introduced by merge commit fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d Signed-off-by: Antonio Quartulli <[email protected]> --- 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) -- 1.8.4.5
