Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / net / batman-adv / icmp_socket.c

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index fa22ba2bb832ac97b58b4b35c36830fceb7e75ee..ac3520e057c0079d97943433a8df648ac1cc402c 100644 (file)
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -46,7 +46,7 @@ static int bat_socket_open(struct inode *inode, struct file *file)
 
        nonseekable_open(inode, file);
 
-       socket_client = kmalloc(sizeof(struct socket_client), GFP_KERNEL);
+       socket_client = kmalloc(sizeof(*socket_client), GFP_KERNEL);
 
        if (!socket_client)
                return -ENOMEM;
@@ -310,7 +310,7 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
 {
        struct socket_packet *socket_packet;
 
-       socket_packet = kmalloc(sizeof(struct socket_packet), GFP_ATOMIC);
+       socket_packet = kmalloc(sizeof(*socket_packet), GFP_ATOMIC);
 
        if (!socket_packet)
                return;