Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-microblaze.git] / net / batman-adv / translation-table.c

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 9b4551a..feaf492 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -43,7 +43,6 @@
 #include <linux/stddef.h>
 #include <linux/string.h>
 #include <linux/workqueue.h>
-#include <net/net_namespace.h>
 
 #include "bridge_loop_avoidance.h"
 #include "hard-interface.h"
@@ -76,9 +75,9 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,
  *
  * Compare the MAC address and the VLAN ID of the two TT entries and check if
  * they are the same TT client.
- * Return: 1 if the two TT clients are the same, 0 otherwise
+ * Return: true if the two TT clients are the same, false otherwise
  */
-static int batadv_compare_tt(const struct hlist_node *node, const void *data2)
+static bool batadv_compare_tt(const struct hlist_node *node, const void *data2)
 {
        const void *data1 = container_of(node, struct batadv_tt_common_entry,
                                         hash_entry);
@@ -585,6 +584,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,
        struct batadv_priv *bat_priv = netdev_priv(soft_iface);
        struct batadv_tt_local_entry *tt_local;
        struct batadv_tt_global_entry *tt_global = NULL;
+       struct net *net = dev_net(soft_iface);
        struct batadv_softif_vlan *vlan;
        struct net_device *in_dev = NULL;
        struct hlist_head *head;
@@ -596,7 +596,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,
        u32 match_mark;
 
        if (ifindex != BATADV_NULL_IFINDEX)
-               in_dev = dev_get_by_index(&init_net, ifindex);
+               in_dev = dev_get_by_index(net, ifindex);
 
        tt_local = batadv_tt_local_hash_find(bat_priv, addr, vid);
 
@@ -1010,8 +1010,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)
        seq_printf(seq,
                   "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n",
                   net_dev->name, (u8)atomic_read(&bat_priv->tt.vn));
-       seq_printf(seq, "       %-13s  %s %-8s %-9s (%-10s)\n", "Client", "VID",
-                  "Flags", "Last seen", "CRC");
+       seq_puts(seq,
+                "       Client         VID Flags    Last seen (CRC       )\n");
 
        for (i = 0; i < hash->size; i++) {
                head = &hash->table[i];
@@ -1680,9 +1680,8 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset)
        seq_printf(seq,
                   "Globally announced TT entries received via the mesh %s\n",
                   net_dev->name);
-       seq_printf(seq, "       %-13s  %s  %s       %-15s %s (%-10s) %s\n",
-                  "Client", "VID", "(TTVN)", "Originator", "(Curr TTVN)",
-                  "CRC", "Flags");
+       seq_puts(seq,
+                "       Client         VID  (TTVN)       Originator      (Curr TTVN) (CRC       ) Flags\n");
 
        for (i = 0; i < hash->size; i++) {
                head = &hash->table[i];
@@ -2362,19 +2361,19 @@ unlock:
  * @entry_ptr: to be checked local tt entry
  * @data_ptr: not used but definition required to satisfy the callback prototype
  *
- * Return: 1 if the entry is a valid, 0 otherwise.
+ * Return: true if the entry is a valid, false otherwise.
  */
-static int batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr)
+static bool batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr)
 {
        const struct batadv_tt_common_entry *tt_common_entry = entry_ptr;
 
        if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW)
-               return 0;
-       return 1;
+               return false;
+       return true;
 }
 
-static int batadv_tt_global_valid(const void *entry_ptr,
-                                 const void *data_ptr)
+static bool batadv_tt_global_valid(const void *entry_ptr,
+                                  const void *data_ptr)
 {
        const struct batadv_tt_common_entry *tt_common_entry = entry_ptr;
        const struct batadv_tt_global_entry *tt_global_entry;
@@ -2382,7 +2381,7 @@ static int batadv_tt_global_valid(const void *entry_ptr,
 
        if (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM ||
            tt_common_entry->flags & BATADV_TT_CLIENT_TEMP)
-               return 0;
+               return false;
 
        tt_global_entry = container_of(tt_common_entry,
                                       struct batadv_tt_global_entry,
@@ -2404,7 +2403,8 @@ static int batadv_tt_global_valid(const void *entry_ptr,
 static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,
                                    struct batadv_hashtable *hash,
                                    void *tvlv_buff, u16 tt_len,
-                                   int (*valid_cb)(const void *, const void *),
+                                   bool (*valid_cb)(const void *,
+                                                    const void *),
                                    void *cb_data)
 {
        struct batadv_tt_common_entry *tt_common_entry;
@@ -2553,11 +2553,11 @@ static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv,
  *
  * Return: true if the TT Request was sent, false otherwise
  */
-static int batadv_send_tt_request(struct batadv_priv *bat_priv,
-                                 struct batadv_orig_node *dst_orig_node,
-                                 u8 ttvn,
-                                 struct batadv_tvlv_tt_vlan_data *tt_vlan,
-                                 u16 num_vlan, bool full_table)
+static bool batadv_send_tt_request(struct batadv_priv *bat_priv,
+                                  struct batadv_orig_node *dst_orig_node,
+                                  u8 ttvn,
+                                  struct batadv_tvlv_tt_vlan_data *tt_vlan,
+                                  u16 num_vlan, bool full_table)
 {
        struct batadv_tvlv_tt_data *tvlv_tt_data = NULL;
        struct batadv_tt_req_node *tt_req_node = NULL;
@@ -3201,7 +3201,7 @@ static void batadv_tt_purge(struct work_struct *work)
        struct batadv_priv_tt *priv_tt;
        struct batadv_priv *bat_priv;
 
-       delayed_work = container_of(work, struct delayed_work, work);
+       delayed_work = to_delayed_work(work);
        priv_tt = container_of(delayed_work, struct batadv_priv_tt, work);
        bat_priv = container_of(priv_tt, struct batadv_priv, tt);