The following commit has been merged in the master branch: commit 3ae241d0ae30f1a719dce9c97e318c01a060a838 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Tue Oct 12 10:00:08 2010 +0000

batman-adv: Keep line length to 80 chars

48628bb9419fb5b01a26ca995465d1aded1e47ed added a line over the limit of 80 chars. This should be avoided according to the kernel Documentation/CodingStyle.

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/soft-interface.c b/soft-interface.c index 22fe548..683ec5f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -220,7 +220,8 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset) return 0; }

-static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, short vid) +static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, + short vid) { struct bat_priv *bat_priv = netdev_priv(dev); struct ethhdr *ethhdr = (struct ethhdr *)skb->data;