24 files changed, 61 insertions, 48 deletions

diff --git a/net/atm/lec.c b/net/atm/lec.c
index eea051338498..93ce390996c7 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1811,8 +1811,7 @@ make_entry(struct lec_priv *priv, unsigned char *mac_addr)
 {
         struct lec_arp_table *to_return;
 
-        to_return = (struct lec_arp_table *) kmalloc(sizeof(struct lec_arp_table),
-                                                     GFP_ATOMIC);
+        to_return = kmalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);
         if (!to_return) {
                 printk("LEC: Arp entry kmalloc failed\n");
                 return NULL;
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c
index 9d2ef4ffe276..0248c67277ee 100644
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
@@ -10,6 +10,7 @@
 
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_stp.h>
+#include <linux/etherdevice.h>
 #include <linux/module.h>
 
 #define BPDU_TYPE_CONFIG 0
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index f8ffbf6e2333..00729b3604f8 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -944,7 +944,7 @@ static int do_replace(void __user *user, unsigned int len)
         if (countersize)
                 memset(newinfo->counters, 0, countersize);
 
-        newinfo->entries = (char *)vmalloc(tmp.entries_size);
+        newinfo->entries = vmalloc(tmp.entries_size);
         if (!newinfo->entries) {
                 ret = -ENOMEM;
                 goto free_newinfo;
@@ -1146,7 +1146,7 @@ int ebt_register_table(struct ebt_table *table)
         if (!newinfo)
                 return -ENOMEM;
 
-        newinfo->entries = (char *)vmalloc(table->table->entries_size);
+        newinfo->entries = vmalloc(table->table->entries_size);
         if (!(newinfo->entries))
                 goto free_newinfo;
 
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index cb530eef0e39..05d60850840e 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -158,7 +158,7 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
         int err = 0;
         struct dev_mc_list *dmi, *dmi1;
 
-        dmi1 = (struct dev_mc_list *)kmalloc(sizeof(*dmi), GFP_ATOMIC);
+        dmi1 = kmalloc(sizeof(*dmi), GFP_ATOMIC);
 
         spin_lock_bh(&dev->xmit_lock);
         for (dmi = dev->mc_list; dmi != NULL; dmi = dmi->next) {
diff --git a/net/core/dv.c b/net/core/dv.c
index c5deb3655257..1516a90a138d 100644
--- a/net/core/dv.c
+++ b/net/core/dv.c
@@ -457,7 +457,7 @@ void divert_frame(struct sk_buff *skb)
         unsigned char                   *skb_data_end = skb->data + skb->len;
 
         /* Packet is already aimed at us, return */
-        if (!compare_ether_addr(eth, skb->dev->dev_addr))
+        if (!compare_ether_addr(eth->h_dest, skb->dev->dev_addr))
                 return;
         
         /* proto is not IP, do nothing */
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 34758118c10c..192092b89e53 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -975,7 +975,7 @@ static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)
          * for deleted items allows change reports to use common code with
          * non-deleted or query-response MCA's.
          */
-        pmc = (struct ip_mc_list *)kmalloc(sizeof(*pmc), GFP_KERNEL);
+        pmc = kmalloc(sizeof(*pmc), GFP_KERNEL);
         if (!pmc)
                 return;
         memset(pmc, 0, sizeof(*pmc));
@@ -1155,7 +1155,7 @@ void ip_mc_inc_group(struct in_device *in_dev, u32 addr)
                 }
         }
 
-        im = (struct ip_mc_list *)kmalloc(sizeof(*im), GFP_KERNEL);
+        im = kmalloc(sizeof(*im), GFP_KERNEL);
         if (!im)
                 goto out;
 
@@ -1476,7 +1476,7 @@ static int ip_mc_add1_src(struct ip_mc_list *pmc, int sfmode,
                 psf_prev = psf;
         }
         if (!psf) {
-                psf = (struct ip_sf_list *)kmalloc(sizeof(*psf), GFP_ATOMIC);
+                psf = kmalloc(sizeof(*psf), GFP_ATOMIC);
                 if (!psf)
                         return -ENOBUFS;
                 memset(psf, 0, sizeof(*psf));
@@ -1659,7 +1659,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
         err = -ENOBUFS;
         if (count >= sysctl_igmp_max_memberships)
                 goto done;
-        iml = (struct ip_mc_socklist *)sock_kmalloc(sk,sizeof(*iml),GFP_KERNEL);
+        iml = sock_kmalloc(sk,sizeof(*iml),GFP_KERNEL);
         if (iml == NULL)
                 goto done;
 
@@ -1823,8 +1823,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
 
                 if (psl)
                         count += psl->sl_max;
-                newpsl = (struct ip_sf_socklist *)sock_kmalloc(sk,
-                        IP_SFLSIZE(count), GFP_KERNEL);
+                newpsl = sock_kmalloc(sk, IP_SFLSIZE(count), GFP_KERNEL);
                 if (!newpsl) {
                         err = -ENOBUFS;
                         goto done;
@@ -1907,8 +1906,8 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
                 goto done;
         }
         if (msf->imsf_numsrc) {
-                newpsl = (struct ip_sf_socklist *)sock_kmalloc(sk,
-                                IP_SFLSIZE(msf->imsf_numsrc), GFP_KERNEL);
+                newpsl = sock_kmalloc(sk, IP_SFLSIZE(msf->imsf_numsrc),
+                                                           GFP_KERNEL);
                 if (!newpsl) {
                         err = -ENOBUFS;
                         goto done;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 6986e11d65cc..2bf8d782f678 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -621,7 +621,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
                                 err = -ENOBUFS;
                                 break;
                         }
-                        msf = (struct ip_msfilter *)kmalloc(optlen, GFP_KERNEL);
+                        msf = kmalloc(optlen, GFP_KERNEL);
                         if (msf == 0) {
                                 err = -ENOBUFS;
                                 break;
@@ -778,7 +778,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
                                 err = -ENOBUFS;
                                 break;
                         }
-                        gsf = (struct group_filter *)kmalloc(optlen,GFP_KERNEL);
+                        gsf = kmalloc(optlen,GFP_KERNEL);
                         if (gsf == 0) {
                                 err = -ENOBUFS;
                                 break;
@@ -798,7 +798,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
                                 goto mc_msf_out;
                         }
                         msize = IP_MSFILTER_SIZE(gsf->gf_numsrc);
-                        msf = (struct ip_msfilter *)kmalloc(msize,GFP_KERNEL);
+                        msf = kmalloc(msize,GFP_KERNEL);
                         if (msf == 0) {
                                 err = -ENOBUFS;
                                 goto mc_msf_out;
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
index 4108a5e12b3c..d716bba798f2 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
@@ -762,7 +762,7 @@ static struct ip_conntrack_helper pptp = {
         .help = conntrack_pptp_help
 };
 
-extern void __exit ip_ct_proto_gre_fini(void);
+extern void ip_ct_proto_gre_fini(void);
 extern int __init ip_ct_proto_gre_init(void);
 
 /* ip_conntrack_pptp initialization */
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_gre.c b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
index 57956dee60c8..c777abf16cb7 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -309,7 +309,10 @@ int __init ip_ct_proto_gre_init(void)
         return ip_conntrack_protocol_register(&gre);
 }
 
-void __exit ip_ct_proto_gre_fini(void)
+/* This cannot be __exit, as it is invoked from ip_conntrack_helper_pptp.c's
+ * init() code on errors.
+ */
+void ip_ct_proto_gre_fini(void)
 {
         struct list_head *pos, *n;
 
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index c63868dd2ca2..5eac9318320e 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -549,7 +549,7 @@ done:
                         retv = -ENOBUFS;
                         break;
                 }
-                gsf = (struct group_filter *)kmalloc(optlen,GFP_KERNEL);
+                gsf = kmalloc(optlen,GFP_KERNEL);
                 if (gsf == 0) {
                         retv = -ENOBUFS;
                         break;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 1cf305a9f8dd..cc3e9f560867 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -449,8 +449,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
 
                 if (psl)
                         count += psl->sl_max;
-                newpsl = (struct ip6_sf_socklist *)sock_kmalloc(sk,
-                        IP6_SFLSIZE(count), GFP_ATOMIC);
+                newpsl = sock_kmalloc(sk, IP6_SFLSIZE(count), GFP_ATOMIC);
                 if (!newpsl) {
                         err = -ENOBUFS;
                         goto done;
@@ -535,8 +534,8 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
                 goto done;
         }
         if (gsf->gf_numsrc) {
-                newpsl = (struct ip6_sf_socklist *)sock_kmalloc(sk,
-                                IP6_SFLSIZE(gsf->gf_numsrc), GFP_ATOMIC);
+                newpsl = sock_kmalloc(sk, IP6_SFLSIZE(gsf->gf_numsrc),
+                                                          GFP_ATOMIC);
                 if (!newpsl) {
                         err = -ENOBUFS;
                         goto done;
@@ -768,7 +767,7 @@ static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
          * for deleted items allows change reports to use common code with
          * non-deleted or query-response MCA's.
          */
-        pmc = (struct ifmcaddr6 *)kmalloc(sizeof(*pmc), GFP_ATOMIC);
+        pmc = kmalloc(sizeof(*pmc), GFP_ATOMIC);
         if (!pmc)
                 return;
         memset(pmc, 0, sizeof(*pmc));
@@ -1937,7 +1936,7 @@ static int ip6_mc_add1_src(struct ifmcaddr6 *pmc, int sfmode,
                 psf_prev = psf;
         }
         if (!psf) {
-                psf = (struct ip6_sf_list *)kmalloc(sizeof(*psf), GFP_ATOMIC);
+                psf = kmalloc(sizeof(*psf), GFP_ATOMIC);
                 if (!psf)
                         return -ENOBUFS;
                 memset(psf, 0, sizeof(*psf));
diff --git a/net/ipv6/netfilter/ip6t_mac.c b/net/ipv6/netfilter/ip6t_mac.c
index ae0b09291d17..c848152315bc 100644
--- a/net/ipv6/netfilter/ip6t_mac.c
+++ b/net/ipv6/netfilter/ip6t_mac.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 
 #include <linux/netfilter_ipv6/ip6t_mac.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index a25f4e8a8ada..66d04004afda 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -67,6 +67,9 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
+/* Socket used for sending RSTs and ACKs */
+static struct socket *tcp6_socket;
+
 static void     tcp_v6_send_reset(struct sk_buff *skb);
 static void     tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req);
 static void     tcp_v6_send_check(struct sock *sk, int len, 
@@ -611,7 +614,7 @@ static void tcp_v6_send_reset(struct sk_buff *skb)
         if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
 
                 if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
-                        ip6_xmit(NULL, buff, &fl, NULL, 0);
+                        ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0);
                         TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
                         TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);
                         return;
@@ -675,7 +678,7 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32
 
         if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
                 if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
-                        ip6_xmit(NULL, buff, &fl, NULL, 0);
+                        ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0);
                         TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
                         return;
                 }
@@ -1600,8 +1603,21 @@ static struct inet_protosw tcpv6_protosw = {
 
 void __init tcpv6_init(void)
 {
+        int err;
+
         /* register inet6 protocol */
         if (inet6_add_protocol(&tcpv6_protocol, IPPROTO_TCP) < 0)
                 printk(KERN_ERR "tcpv6_init: Could not register protocol\n");
         inet6_register_protosw(&tcpv6_protosw);
+
+        err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_TCP, &tcp6_socket);
+        if (err < 0)
+                panic("Failed to create the TCPv6 control socket.\n");
+        tcp6_socket->sk->sk_allocation = GFP_ATOMIC;
+
+        /* Unhash it so that IP input processing does not even
+         * see it, we do not wish this socket to see incoming
+         * packets.
+         */
+        tcp6_socket->sk->sk_prot->unhash(tcp6_socket->sk);
 }
diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c
index 75f2666e8630..c6d169fbdceb 100644
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
@@ -82,8 +82,7 @@ struct ias_object *irias_new_object( char *name, int id)
 
         IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
 
-        obj = (struct ias_object *) kmalloc(sizeof(struct ias_object),
-                                            GFP_ATOMIC);
+        obj = kmalloc(sizeof(struct ias_object), GFP_ATOMIC);
         if (obj == NULL) {
                 IRDA_WARNING("%s(), Unable to allocate object!\n",
                              __FUNCTION__);
@@ -348,8 +347,7 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value,
         IRDA_ASSERT(obj->magic == IAS_OBJECT_MAGIC, return;);
         IRDA_ASSERT(name != NULL, return;);
 
-        attrib = (struct ias_attrib *) kmalloc(sizeof(struct ias_attrib),
-                                               GFP_ATOMIC);
+        attrib = kmalloc(sizeof(struct ias_attrib), GFP_ATOMIC);
         if (attrib == NULL) {
                 IRDA_WARNING("%s: Unable to allocate attribute!\n",
                              __FUNCTION__);
@@ -385,8 +383,7 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets,
         IRDA_ASSERT(name != NULL, return;);
         IRDA_ASSERT(octets != NULL, return;);
 
-        attrib = (struct ias_attrib *) kmalloc(sizeof(struct ias_attrib),
-                                               GFP_ATOMIC);
+        attrib = kmalloc(sizeof(struct ias_attrib), GFP_ATOMIC);
         if (attrib == NULL) {
                 IRDA_WARNING("%s: Unable to allocate attribute!\n",
                              __FUNCTION__);
@@ -420,8 +417,7 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value,
         IRDA_ASSERT(name != NULL, return;);
         IRDA_ASSERT(value != NULL, return;);
 
-        attrib = (struct ias_attrib *) kmalloc(sizeof( struct ias_attrib),
-                                               GFP_ATOMIC);
+        attrib = kmalloc(sizeof( struct ias_attrib), GFP_ATOMIC);
         if (attrib == NULL) {
                 IRDA_WARNING("%s: Unable to allocate attribute!\n",
                              __FUNCTION__);
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f69e5ed9bd06..c6ee29f8eec0 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1237,7 +1237,7 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq)
                 goto done;
 
         err = -ENOBUFS;
-        i = (struct packet_mclist *)kmalloc(sizeof(*i), GFP_KERNEL);
+        i = kmalloc(sizeof(*i), GFP_KERNEL);
         if (i == NULL)
                 goto done;
 
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 55cd5327fbd7..8a260d43ceef 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -411,7 +411,7 @@ config NET_EMATCH_META
         tristate "Metadata"
         depends on NET_EMATCH
         ---help---
-          Say Y here if you want to be ablt to classify packets based on
+          Say Y here if you want to be able to classify packets based on
           metadata such as load average, netfilter attributes, socket
           attributes and routing decisions.
 
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 64b047c65568..5cb956b721e8 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -92,7 +92,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
 #include <net/pkt_cls.h>
-#include <config/net/ematch/stack.h>
 
 static LIST_HEAD(ematch_ops);
 static DEFINE_RWLOCK(ematch_mod_lock);
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index f9573eba5c7a..556c495c6922 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1287,7 +1287,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
                         - (bodysize % SCTP_COOKIE_MULTIPLE);
         *cookie_len = headersize + bodysize;
 
-        retval = (sctp_cookie_param_t *)kmalloc(*cookie_len, GFP_ATOMIC);
+        retval = kmalloc(*cookie_len, GFP_ATOMIC);
 
         if (!retval) {
                 *cookie_len = 0;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index fc04d185fa33..a268eab68ca1 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -860,7 +860,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk,
                 return -EFAULT;
 
         /* Alloc space for the address array in kernel memory.  */
-        kaddrs = (struct sockaddr *)kmalloc(addrs_size, GFP_KERNEL);
+        kaddrs = kmalloc(addrs_size, GFP_KERNEL);
         if (unlikely(!kaddrs))
                 return -ENOMEM;
 
@@ -1150,7 +1150,7 @@ SCTP_STATIC int sctp_setsockopt_connectx(struct sock* sk,
                 return -EFAULT;
 
         /* Alloc space for the address array in kernel memory.  */
-        kaddrs = (struct sockaddr *)kmalloc(addrs_size, GFP_KERNEL);
+        kaddrs = kmalloc(addrs_size, GFP_KERNEL);
         if (unlikely(!kaddrs))
                 return -ENOMEM;
 
diff --git a/net/socket.c b/net/socket.c
index 06fa217f58a9..b38a263853c3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -993,7 +993,7 @@ static int sock_fasync(int fd, struct file *filp, int on)
 
         if (on)
         {
-                fna=(struct fasync_struct *)kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
+                fna = kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
                 if(fna==NULL)
                         return -ENOMEM;
         }
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 8c7756036e95..9ac1b8c26c01 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -94,7 +94,7 @@ rpcauth_init_credcache(struct rpc_auth *auth, unsigned long expire)
         struct rpc_cred_cache *new;
         int i;
 
-        new = (struct rpc_cred_cache *)kmalloc(sizeof(*new), GFP_KERNEL);
+        new = kmalloc(sizeof(*new), GFP_KERNEL);
         if (!new)
                 return -ENOMEM;
         for (i = 0; i < RPC_CREDCACHE_NR; i++)
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 890fb5ea0dcb..1b3ed4fd1987 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -70,7 +70,7 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         dprintk("RPC:      allocating UNIX cred for uid %d gid %d\n",
                                 acred->uid, acred->gid);
 
-        if (!(cred = (struct unx_cred *) kmalloc(sizeof(*cred), GFP_KERNEL)))
+        if (!(cred = kmalloc(sizeof(*cred), GFP_KERNEL)))
                 return ERR_PTR(-ENOMEM);
 
         atomic_set(&cred->uc_count, 1);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 4cef7fa2b740..d2f0550c4ba0 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -118,7 +118,7 @@ rpc_new_client(struct rpc_xprt *xprt, char *servname,
                 goto out_err;
 
         err = -ENOMEM;
-        clnt = (struct rpc_clnt *) kmalloc(sizeof(*clnt), GFP_KERNEL);
+        clnt = kmalloc(sizeof(*clnt), GFP_KERNEL);
         if (!clnt)
                 goto out_err;
         memset(clnt, 0, sizeof(*clnt));
@@ -225,7 +225,7 @@ rpc_clone_client(struct rpc_clnt *clnt)
 {
         struct rpc_clnt *new;
 
-        new = (struct rpc_clnt *)kmalloc(sizeof(*new), GFP_KERNEL);
+        new = kmalloc(sizeof(*new), GFP_KERNEL);
         if (!new)
                 goto out_no_clnt;
         memcpy(new, clnt, sizeof(*new));
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a8bd34d47425..b08419e1fc68 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -32,7 +32,7 @@ svc_create(struct svc_program *prog, unsigned int bufsize)
         int vers;
         unsigned int xdrsize;
 
-        if (!(serv = (struct svc_serv *) kmalloc(sizeof(*serv), GFP_KERNEL)))
+        if (!(serv = kmalloc(sizeof(*serv), GFP_KERNEL)))
                 return NULL;
         memset(serv, 0, sizeof(*serv));
         serv->sv_name      = prog->pg_name;