Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[sfrench/cifs-2.6.git] / drivers / staging / batman-adv / send.c

diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c
index e61a62c6cb9a836794869606aed2167700cb7eca..055edee7b4e401be0f9142d222fab9a52631c150 100644 (file)
--- a/drivers/staging/batman-adv/send.c
+++ b/drivers/staging/batman-adv/send.c
@@ -42,15 +42,15 @@ static uint8_t hop_penalty(const uint8_t tq)
 /* when do we schedule our own packet to be sent */
 static unsigned long own_send_time(struct bat_priv *bat_priv)
 {
-       return jiffies +
-               (((atomic_read(&bat_priv->orig_interval) - JITTER +
-                  (random32() % 2*JITTER)) * HZ) / 1000);
+       return jiffies + msecs_to_jiffies(
+                  atomic_read(&bat_priv->orig_interval) -
+                  JITTER + (random32() % 2*JITTER));
 }
 
 /* when do we schedule a forwarded packet to be sent */
 static unsigned long forward_send_time(struct bat_priv *bat_priv)
 {
-       return jiffies + (((random32() % (JITTER/2)) * HZ) / 1000);
+       return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
 }
 
 /* send out an already prepared packet to the given address via the
@@ -68,10 +68,8 @@ int send_skb_packet(struct sk_buff *skb,
                goto send_skb_err;
 
        if (!(batman_if->net_dev->flags & IFF_UP)) {
-               printk(KERN_WARNING
-                      "batman-adv:Interface %s "
-                      "is not up - can't send packet via that interface!\n",
-                      batman_if->dev);
+               pr_warning("Interface %s is not up - can't send packet via "
+                          "that interface!\n", batman_if->dev);
                goto send_skb_err;
        }
 
@@ -126,6 +124,8 @@ void send_raw_packet(unsigned char *pack_buff, int pack_buff_len,
 static void send_packet_to_if(struct forw_packet *forw_packet,
                              struct batman_if *batman_if)
 {
+       /* FIXME: each batman_if will be attached to a softif */
+       struct bat_priv *bat_priv = netdev_priv(soft_device);
        char *fwd_str;
        uint8_t packet_num;
        int16_t buff_pos;
@@ -155,7 +155,7 @@ static void send_packet_to_if(struct forw_packet *forw_packet,
                fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?
                                                            "Sending own" :
                                                            "Forwarding"));
-               bat_dbg(DBG_BATMAN,
+               bat_dbg(DBG_BATMAN, bat_priv,
                        "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d,"
                        " IDF %s) on interface %s [%s]\n",
                        fwd_str, (packet_num > 0 ? "aggregated " : ""),
@@ -174,20 +174,22 @@ static void send_packet_to_if(struct forw_packet *forw_packet,
 
        send_raw_packet(forw_packet->packet_buff,
                        forw_packet->packet_len,
-                       batman_if, broadcastAddr);
+                       batman_if, broadcast_addr);
 }
 
 /* send a batman packet */
 static void send_packet(struct forw_packet *forw_packet)
 {
+       /* FIXME: each batman_if will be attached to a softif */
+       struct bat_priv *bat_priv = netdev_priv(soft_device);
        struct batman_if *batman_if;
        struct batman_packet *batman_packet =
                (struct batman_packet *)(forw_packet->packet_buff);
        unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0);
 
        if (!forw_packet->if_incoming) {
-               printk(KERN_ERR "batman-adv: Error - can't forward packet: "
-                      "incoming iface not specified\n");
+               pr_err("Error - can't forward packet: incoming iface not "
+                      "specified\n");
                return;
        }
 
@@ -200,7 +202,7 @@ static void send_packet(struct forw_packet *forw_packet)
            (forw_packet->own && (forw_packet->if_incoming->if_num > 0))) {
 
                /* FIXME: what about aggregated packets ? */
-               bat_dbg(DBG_BATMAN,
+               bat_dbg(DBG_BATMAN, bat_priv,
                        "%s packet (originator %pM, seqno %d, TTL %d) "
                        "on interface %s [%s]\n",
                        (forw_packet->own ? "Sending own" : "Forwarding"),
@@ -211,7 +213,7 @@ static void send_packet(struct forw_packet *forw_packet)
                send_raw_packet(forw_packet->packet_buff,
                                forw_packet->packet_len,
                                forw_packet->if_incoming,
-                               broadcastAddr);
+                               broadcast_addr);
                return;
        }
 
@@ -313,7 +315,7 @@ void schedule_forward_packet(struct orig_node *orig_node,
        unsigned long send_time;
 
        if (batman_packet->ttl <= 1) {
-               bat_dbg(DBG_BATMAN, "ttl exceeded\n");
+               bat_dbg(DBG_BATMAN, bat_priv, "ttl exceeded\n");
                return;
        }
 
@@ -342,7 +344,8 @@ void schedule_forward_packet(struct orig_node *orig_node,
        /* apply hop penalty */
        batman_packet->tq = hop_penalty(batman_packet->tq);
 
-       bat_dbg(DBG_BATMAN, "Forwarding packet: tq_orig: %i, tq_avg: %i, "
+       bat_dbg(DBG_BATMAN, bat_priv,
+               "Forwarding packet: tq_orig: %i, tq_avg: %i, "
                "tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n",
                in_tq, tq_avg, batman_packet->tq, in_ttl - 1,
                batman_packet->ttl);
@@ -402,9 +405,11 @@ int add_bcast_packet_to_list(struct sk_buff *skb)
 {
        struct forw_packet *forw_packet;
        struct bcast_packet *bcast_packet;
+       /* FIXME: each batman_if will be attached to a softif */
+       struct bat_priv *bat_priv = netdev_priv(soft_device);
 
        if (!atomic_dec_not_zero(&bcast_queue_left)) {
-               bat_dbg(DBG_BATMAN, "bcast packet queue full\n");
+               bat_dbg(DBG_BATMAN, bat_priv, "bcast packet queue full\n");
                goto out;
        }
 
@@ -464,7 +469,7 @@ static void send_outstanding_bcast_packet(struct work_struct *work)
                skb1 = skb_copy(forw_packet->skb, GFP_ATOMIC);
                if (skb1)
                        send_skb_packet(skb1,
-                               batman_if, broadcastAddr);
+                               batman_if, broadcast_addr);
        }
        rcu_read_unlock();
 
@@ -516,15 +521,19 @@ out:
 
 void purge_outstanding_packets(struct batman_if *batman_if)
 {
+       /* FIXME: each batman_if will be attached to a softif */
+       struct bat_priv *bat_priv = netdev_priv(soft_device);
        struct forw_packet *forw_packet;
        struct hlist_node *tmp_node, *safe_tmp_node;
        unsigned long flags;
 
        if (batman_if)
-               bat_dbg(DBG_BATMAN, "purge_outstanding_packets(): %s\n",
+               bat_dbg(DBG_BATMAN, bat_priv,
+                       "purge_outstanding_packets(): %s\n",
                        batman_if->dev);
        else
-               bat_dbg(DBG_BATMAN, "purge_outstanding_packets()\n");
+               bat_dbg(DBG_BATMAN, bat_priv,
+                       "purge_outstanding_packets()\n");
 
        /* free bcast list */
        spin_lock_irqsave(&forw_bcast_list_lock, flags);