From ef38fb29716e5e6c92a072d0500e901fd4f02709 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 17:23:22 +0000
Subject: [PATCH] --- yaml --- r: 202608 b: refs/heads/master c:
 5d55354f147bcf82b7a330bf9617b82a692b7d49 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/mcast.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 660e97a71fcb..4c728b9c3966 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ed37a6fa70a3a63dbb257fc640facb3974bba40
+refs/heads/master: 5d55354f147bcf82b7a330bf9617b82a692b7d49
diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c
index 59f1881968c7..7b5fb43c227c 100644
--- a/trunk/net/ipv6/mcast.c
+++ b/trunk/net/ipv6/mcast.c
@@ -1995,8 +1995,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)
 				    &psf->sf_addr))
 					break;
 			if (!dpsf) {
-				dpsf = (struct ip6_sf_list *)
-					kmalloc(sizeof(*dpsf), GFP_ATOMIC);
+				dpsf = kmalloc(sizeof(*dpsf), GFP_ATOMIC);
 				if (!dpsf)
 					continue;
 				*dpsf = *psf;