sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot

[karo-tx-linux.git] / net / batman-adv / gateway_client.c

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 24403a7350f75fb5767e8855041c31b8d166fea9..6f9b9b78f77d253396cfc9fab961d7dcb656c1ff 100644 (file)
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -224,16 +224,13 @@ void gw_election(struct bat_priv *bat_priv)
        } else if ((!curr_gw) && (next_gw)) {
                bat_dbg(DBG_BATMAN, bat_priv,
                        "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
-                       next_gw->orig_node->orig,
-                       next_gw->orig_node->gw_flags,
+                       next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
                        router->tq_avg);
                throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
        } else {
                bat_dbg(DBG_BATMAN, bat_priv,
-                       "Changing route to gateway %pM "
-                       "(gw_flags: %i, tq: %i)\n",
-                       next_gw->orig_node->orig,
-                       next_gw->orig_node->gw_flags,
+                       "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
+                       next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
                        router->tq_avg);
                throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
        }
@@ -287,8 +284,7 @@ void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node)
                goto out;
 
        bat_dbg(DBG_BATMAN, bat_priv,
-               "Restarting gateway selection: better gateway found (tq curr: "
-               "%i, tq new: %i)\n",
+               "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
                gw_tq_avg, orig_tq_avg);
 
 deselect:
@@ -352,8 +348,7 @@ void gw_node_update(struct bat_priv *bat_priv,
                        continue;
 
                bat_dbg(DBG_BATMAN, bat_priv,
-                       "Gateway class of originator %pM changed from "
-                       "%i to %i\n",
+                       "Gateway class of originator %pM changed from %i to %i\n",
                        orig_node->orig, gw_node->orig_node->gw_flags,
                        new_gwflags);
 
@@ -396,7 +391,7 @@ void gw_node_purge(struct bat_priv *bat_priv)
 {
        struct gw_node *gw_node, *curr_gw;
        struct hlist_node *node, *node_tmp;
-       unsigned long timeout = 2 * PURGE_TIMEOUT * HZ;
+       unsigned long timeout = msecs_to_jiffies(2 * PURGE_TIMEOUT);
        int do_deselect = 0;
 
        curr_gw = gw_get_selected_gw_node(bat_priv);
@@ -474,23 +469,23 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset)
 
        primary_if = primary_if_get_selected(bat_priv);
        if (!primary_if) {
-               ret = seq_printf(seq, "BATMAN mesh %s disabled - please "
-                                "specify interfaces to enable it\n",
+               ret = seq_printf(seq,
+                                "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
                                 net_dev->name);
                goto out;
        }
 
        if (primary_if->if_status != IF_ACTIVE) {
-               ret = seq_printf(seq, "BATMAN mesh %s disabled - "
-                                "primary interface not active\n",
+               ret = seq_printf(seq,
+                                "BATMAN mesh %s disabled - primary interface not active\n",
                                 net_dev->name);
                goto out;
        }
 
-       seq_printf(seq, "      %-12s (%s/%i) %17s [%10s]: gw_class ... "
-                  "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
-                  "Gateway", "#", TQ_MAX_VALUE, "Nexthop",
-                  "outgoingIF", SOURCE_VERSION, primary_if->net_dev->name,
+       seq_printf(seq,
+                  "      %-12s (%s/%i) %17s [%10s]: gw_class ... [B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
+                  "Gateway", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
+                  SOURCE_VERSION, primary_if->net_dev->name,
                   primary_if->net_dev->dev_addr, net_dev->name);
 
        rcu_read_lock();
@@ -629,7 +624,7 @@ bool gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
 
        /* check for bootp port */
        if ((ntohs(ethhdr->h_proto) == ETH_P_IP) &&
-            (ntohs(udphdr->dest) != 67))
+           (ntohs(udphdr->dest) != 67))
                return false;
 
        if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) &&