X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv4%2Fip_options.c;h=9bebad07bf2ec4baea772a654e7d37808504928c;hb=489447380a2921ec0e9154f773c44ab3167ede4b;hp=bce4e875193be1d596c4c607ab42e9e1f966513f;hpb=ddbf9ef385bfbef897210733abfb73cb9b94ecec;p=linux-2.6

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index bce4e87519..9bebad07bf 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -11,6 +11,7 @@
  *		
  */
 
+#include <linux/capability.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <asm/uaccess.h>
@@ -22,6 +23,7 @@
 #include <net/sock.h>
 #include <net/ip.h>
 #include <net/icmp.h>
+#include <net/route.h>
 
 /* 
  * Write options to IP header, record destination address to
@@ -510,8 +512,7 @@ static int ip_options_get_finish(struct ip_options **optp,
 		kfree(opt);
 		return -EINVAL;
 	}
-	if (*optp)
-		kfree(*optp);
+	kfree(*optp);
 	*optp = opt;
 	return 0;
 }