From e19438818e710d2b43f2a3aa49f8825cce023ede Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 14 May 2011 23:14:53 +0200
Subject: [PATCH] --- yaml --- r: 255306 b: refs/heads/master c:
 958ca5985604a6f13387d32de489365df816558b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/batman-adv/unicast.c | 2 +-
 trunk/net/batman-adv/vis.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 502b256ecdd7..6e54202b03e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f718c20076f4b47c3dc0f1277aef9966928089c
+refs/heads/master: 958ca5985604a6f13387d32de489365df816558b
diff --git a/trunk/net/batman-adv/unicast.c b/trunk/net/batman-adv/unicast.c
index e2deb442f4fe..82717fd9661d 100644
--- a/trunk/net/batman-adv/unicast.c
+++ b/trunk/net/batman-adv/unicast.c
@@ -295,7 +295,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
 
 	/* get routing information */
 	if (is_multicast_ether_addr(ethhdr->h_dest)) {
-		orig_node = (struct orig_node *)gw_get_selected_orig(bat_priv);
+		orig_node = gw_get_selected_orig(bat_priv);
 		if (orig_node)
 			goto find_router;
 	}
diff --git a/trunk/net/batman-adv/vis.c b/trunk/net/batman-adv/vis.c
index adb0327ff28b..b48954cd1e12 100644
--- a/trunk/net/batman-adv/vis.c
+++ b/trunk/net/batman-adv/vis.c
@@ -621,7 +621,7 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
 	struct hlist_head *head;
 	struct orig_node *orig_node;
 	struct neigh_node *router;
-	struct vis_info *info = (struct vis_info *)bat_priv->my_vis_info;
+	struct vis_info *info = bat_priv->my_vis_info;
 	struct vis_packet *packet = (struct vis_packet *)info->skb_packet->data;
 	struct vis_info_entry *entry;
 	struct tt_local_entry *tt_local_entry;