Module Name:    src
Committed By:   rmind
Date:           Fri May 30 02:27:29 UTC 2014

Modified Files:
        src/sys/netinet: tcp_input.c

Log Message:
tcp_signature_getsav: handle !ipsec_used case and fix the build (hi christos!).


To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.333 src/sys/netinet/tcp_input.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.332 src/sys/netinet/tcp_input.c:1.333
--- src/sys/netinet/tcp_input.c:1.332	Fri May 30 01:39:03 2014
+++ src/sys/netinet/tcp_input.c	Fri May 30 02:27:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_input.c,v 1.332 2014/05/30 01:39:03 christos Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.333 2014/05/30 02:27:29 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.332 2014/05/30 01:39:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.333 2014/05/30 02:27:29 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -3170,6 +3170,7 @@ tcp_signature_getsav(struct mbuf *m, str
 		 */
 		return KEY_ALLOCSA(&dst, IPPROTO_TCP, htonl(TCP_SIG_SPI), 0, 0);
 	}
+	return NULL;
 #else
 	if (ip)
 		return key_allocsa(AF_INET, (void *)&ip->ip_src,

Reply via email to