From ef18d0a3bbad238b6bab7ba4bd7f2c38d390cde7 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 14 May 2011 23:14:52 +0200
Subject: [PATCH] --- yaml --- r: 255305 b: refs/heads/master c:
 5f718c20076f4b47c3dc0f1277aef9966928089c h: refs/heads/master i:   255303:
 71e1417785c806dc59a2e87663c2739d6455ee1b v: v3

---
 [refs]                                   | 2 +-
 trunk/net/batman-adv/bitarray.c          | 2 +-
 trunk/net/batman-adv/hard-interface.c    | 2 +-
 trunk/net/batman-adv/translation-table.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 71a851ae050e..502b256ecdd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a4065ec79dcf172c44cb2741c1b9983ecfc492
+refs/heads/master: 5f718c20076f4b47c3dc0f1277aef9966928089c
diff --git a/trunk/net/batman-adv/bitarray.c b/trunk/net/batman-adv/bitarray.c
index 767e2379b1aa..700ee4f7a945 100644
--- a/trunk/net/batman-adv/bitarray.c
+++ b/trunk/net/batman-adv/bitarray.c
@@ -130,7 +130,7 @@ static void bit_reset_window(unsigned long *seq_bits)
 char bit_get_packet(void *priv, unsigned long *seq_bits,
 		    int32_t seq_num_diff, int8_t set_mark)
 {
-	struct bat_priv *bat_priv = (struct bat_priv *)priv;
+	struct bat_priv *bat_priv = priv;
 
 	/* sequence number is slightly older. We already got a sequence number
 	 * higher than this one, so we just mark it. */
diff --git a/trunk/net/batman-adv/hard-interface.c b/trunk/net/batman-adv/hard-interface.c
index 915e12b820b9..e626e75a7e65 100644
--- a/trunk/net/batman-adv/hard-interface.c
+++ b/trunk/net/batman-adv/hard-interface.c
@@ -523,7 +523,7 @@ void hardif_remove_interfaces(void)
 static int hard_if_event(struct notifier_block *this,
 			 unsigned long event, void *ptr)
 {
-	struct net_device *net_dev = (struct net_device *)ptr;
+	struct net_device *net_dev = ptr;
 	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
 	struct hard_iface *primary_if = NULL;
 	struct bat_priv *bat_priv;
diff --git a/trunk/net/batman-adv/translation-table.c b/trunk/net/batman-adv/translation-table.c
index be7b5cc71d28..802eacef05b8 100644
--- a/trunk/net/batman-adv/translation-table.c
+++ b/trunk/net/batman-adv/translation-table.c
@@ -313,7 +313,7 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset)
 
 static void _tt_local_del(struct hlist_node *node, void *arg)
 {
-	struct bat_priv *bat_priv = (struct bat_priv *)arg;
+	struct bat_priv *bat_priv = arg;
 	void *data = container_of(node, struct tt_local_entry, hash_entry);
 
 	kfree(data);