Merge tag 'arm-soc/for-3.20/dts' of http://github.com/broadcom/stblinux into fixes

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / routing.c

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 6648f321864d8f7b33d258f9ee2c93e339738a93..da83982bf974c5d84d8046b7b415b4f2f1b07cb9 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -292,7 +292,6 @@ out:
        return ret;
 }
 
-
 int batadv_recv_icmp_packet(struct sk_buff *skb,
                            struct batadv_hard_iface *recv_if)
 {
@@ -457,7 +456,7 @@ batadv_find_router(struct batadv_priv *bat_priv,
         * the last chosen bonding candidate (next_candidate). If no such
         * router is found, use the first candidate found (the previously
         * chosen bonding candidate might have been the last one in the list).
-        * If this can't be found either, return the previously choosen
+        * If this can't be found either, return the previously chosen
         * router - obviously there are no other candidates.
         */
        rcu_read_lock();