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;