From 262ae43588ae1c4af45b150aaead3b3f921b8711 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 17:23:21 +0000
Subject: [PATCH] --- yaml --- r: 202607 b: refs/heads/master c:
 3ed37a6fa70a3a63dbb257fc640facb3974bba40 h: refs/heads/master i:   202605:
 43f4fb03bbbdd3077bcb65f2a73a2366790df8a3   202603:
 b33d3ff3a2d4fbabbf7cc58ccd9eabeeaf4e8ddc   202599:
 4941ddfea2366482befe0887510891030f9d0252   202591:
 23f090d6e78c7dd467a6893c71d49fb3137b5cb7 v: v3

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

diff --git a/[refs] b/[refs]
index 905c709157ac..660e97a71fcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 589be6500560c70f4873f8c1fb66671624944433
+refs/heads/master: 3ed37a6fa70a3a63dbb257fc640facb3974bba40
diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c
index 5fff865a4fa7..250cb5e1af48 100644
--- a/trunk/net/ipv4/igmp.c
+++ b/trunk/net/ipv4/igmp.c
@@ -1646,8 +1646,7 @@ static int sf_setstate(struct ip_mc_list *pmc)
 				if (dpsf->sf_inaddr == psf->sf_inaddr)
 					break;
 			if (!dpsf) {
-				dpsf = (struct ip_sf_list *)
-					kmalloc(sizeof(*dpsf), GFP_ATOMIC);
+				dpsf = kmalloc(sizeof(*dpsf), GFP_ATOMIC);
 				if (!dpsf)
 					continue;
 				*dpsf = *psf;