X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fcore%2Fsock.c;h=13cc3be4f056fb92f86cd660b6dcd29ba88ed30d;hb=3d5271f9883cba7b54762bc4fe027d4172f06db7;hp=1c52fe809edad0a79038748f589c915ec96f6a6f;hpb=3168c31abe0c11fd3edcefa110d6f590fe8c909f;p=powerpc.git

diff --git a/net/core/sock.c b/net/core/sock.c
index 1c52fe809e..13cc3be4f0 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -940,7 +940,7 @@ static struct sk_buff *sock_alloc_send_pskb(struct sock *sk,
 					    int noblock, int *errcode)
 {
 	struct sk_buff *skb;
-	unsigned int gfp_mask;
+	gfp_t gfp_mask;
 	long timeo;
 	int err;
 
@@ -1242,8 +1242,7 @@ static void sock_def_write_space(struct sock *sk)
 
 static void sock_def_destruct(struct sock *sk)
 {
-	if (sk->sk_protinfo)
-		kfree(sk->sk_protinfo);
+	kfree(sk->sk_protinfo);
 }
 
 void sk_send_sigurg(struct sock *sk)