[NET]: kfree cleanup

From: Jesper Juhl <jesper.juhl@gmail.com>

This is the net/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in net/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>

1 files changed, 4 insertions, 8 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 17758234a3e3..df7f20da422d 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1262,10 +1262,8 @@ int ip_push_pending_frames(struct sock *sk)
 
 out:
         inet->cork.flags &= ~IPCORK_OPT;
-        if (inet->cork.opt) {
-                kfree(inet->cork.opt);
-                inet->cork.opt = NULL;
-        }
+        kfree(inet->cork.opt);
+        inet->cork.opt = NULL;
         if (inet->cork.rt) {
                 ip_rt_put(inet->cork.rt);
                 inet->cork.rt = NULL;
@@ -1289,10 +1287,8 @@ void ip_flush_pending_frames(struct sock *sk)
                 kfree_skb(skb);
 
         inet->cork.flags &= ~IPCORK_OPT;
-        if (inet->cork.opt) {
-                kfree(inet->cork.opt);
-                inet->cork.opt = NULL;
-        }
+        kfree(inet->cork.opt);
+        inet->cork.opt = NULL;
         if (inet->cork.rt) {
                 ip_rt_put(inet->cork.rt);
                 inet->cork.rt = NULL;