batman-adv: Prefix types structs with batadv_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 21 insertions, 20 deletions

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index ca07580c1b44..bde3cf747507 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -26,9 +26,9 @@
 #include "originator.h"
 #include "hard-interface.h"
 
-static struct socket_client *batadv_socket_client_hash[256];
+static struct batadv_socket_client *batadv_socket_client_hash[256];
 
-static void batadv_socket_add_packet(struct socket_client *socket_client,
+static void batadv_socket_add_packet(struct batadv_socket_client *socket_client,
                                      struct batadv_icmp_packet_rr *icmp_packet,
                                      size_t icmp_len);
 
@@ -40,7 +40,7 @@ void batadv_socket_init(void)
 static int batadv_socket_open(struct inode *inode, struct file *file)
 {
         unsigned int i;
-        struct socket_client *socket_client;
+        struct batadv_socket_client *socket_client;
 
         nonseekable_open(inode, file);
 
@@ -77,8 +77,8 @@ static int batadv_socket_open(struct inode *inode, struct file *file)
 
 static int batadv_socket_release(struct inode *inode, struct file *file)
 {
-        struct socket_client *socket_client = file->private_data;
-        struct socket_packet *socket_packet;
+        struct batadv_socket_client *socket_client = file->private_data;
+        struct batadv_socket_packet *socket_packet;
         struct list_head *list_pos, *list_pos_tmp;
 
         spin_lock_bh(&socket_client->lock);
@@ -86,7 +86,7 @@ static int batadv_socket_release(struct inode *inode, struct file *file)
         /* for all packets in the queue ... */
         list_for_each_safe(list_pos, list_pos_tmp, &socket_client->queue_list) {
                 socket_packet = list_entry(list_pos,
-                                           struct socket_packet, list);
+                                           struct batadv_socket_packet, list);
 
                 list_del(list_pos);
                 kfree(socket_packet);
@@ -104,8 +104,8 @@ static int batadv_socket_release(struct inode *inode, struct file *file)
 static ssize_t batadv_socket_read(struct file *file, char __user *buf,
                                   size_t count, loff_t *ppos)
 {
-        struct socket_client *socket_client = file->private_data;
-        struct socket_packet *socket_packet;
+        struct batadv_socket_client *socket_client = file->private_data;
+        struct batadv_socket_packet *socket_packet;
         size_t packet_len;
         int error;
 
@@ -127,7 +127,7 @@ static ssize_t batadv_socket_read(struct file *file, char __user *buf,
         spin_lock_bh(&socket_client->lock);
 
         socket_packet = list_first_entry(&socket_client->queue_list,
-                                         struct socket_packet, list);
+                                         struct batadv_socket_packet, list);
         list_del(&socket_packet->list);
         socket_client->queue_len--;
 
@@ -147,14 +147,14 @@ static ssize_t batadv_socket_read(struct file *file, char __user *buf,
 static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
                                    size_t len, loff_t *off)
 {
-        struct socket_client *socket_client = file->private_data;
-        struct bat_priv *bat_priv = socket_client->bat_priv;
-        struct hard_iface *primary_if = NULL;
+        struct batadv_socket_client *socket_client = file->private_data;
+        struct batadv_priv *bat_priv = socket_client->bat_priv;
+        struct batadv_hard_iface *primary_if = NULL;
         struct sk_buff *skb;
         struct batadv_icmp_packet_rr *icmp_packet;
 
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *neigh_node = NULL;
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *neigh_node = NULL;
         size_t packet_len = sizeof(struct batadv_icmp_packet);
 
         if (len < sizeof(struct batadv_icmp_packet)) {
@@ -255,7 +255,7 @@ out:
 
 static unsigned int batadv_socket_poll(struct file *file, poll_table *wait)
 {
-        struct socket_client *socket_client = file->private_data;
+        struct batadv_socket_client *socket_client = file->private_data;
 
         poll_wait(file, &socket_client->queue_wait, wait);
 
@@ -275,7 +275,7 @@ static const struct file_operations batadv_fops = {
         .llseek = no_llseek,
 };
 
-int batadv_socket_setup(struct bat_priv *bat_priv)
+int batadv_socket_setup(struct batadv_priv *bat_priv)
 {
         struct dentry *d;
 
@@ -293,11 +293,11 @@ err:
         return -ENOMEM;
 }
 
-static void batadv_socket_add_packet(struct socket_client *socket_client,
+static void batadv_socket_add_packet(struct batadv_socket_client *socket_client,
                                      struct batadv_icmp_packet_rr *icmp_packet,
                                      size_t icmp_len)
 {
-        struct socket_packet *socket_packet;
+        struct batadv_socket_packet *socket_packet;
 
         socket_packet = kmalloc(sizeof(*socket_packet), GFP_ATOMIC);
 
@@ -324,7 +324,8 @@ static void batadv_socket_add_packet(struct socket_client *socket_client,
 
         if (socket_client->queue_len > 100) {
                 socket_packet = list_first_entry(&socket_client->queue_list,
-                                                 struct socket_packet, list);
+                                                 struct batadv_socket_packet,
+                                                 list);
 
                 list_del(&socket_packet->list);
                 kfree(socket_packet);
@@ -339,7 +340,7 @@ static void batadv_socket_add_packet(struct socket_client *socket_client,
 void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet,
                                   size_t icmp_len)
 {
-        struct socket_client *hash;
+        struct batadv_socket_client *hash;
 
         hash = batadv_socket_client_hash[icmp_packet->uid];
         if (hash)