diff options
| author | zec <zec@FreeBSD.org> | 2008-11-26 22:32:07 +0000 |
|---|---|---|
| committer | zec <zec@FreeBSD.org> | 2008-11-26 22:32:07 +0000 |
| commit | 95a15f5c8435d206ae030c1ed698f4fca6afdeae (patch) | |
| tree | 92dfba43d59635c80de0299501512e8472dbe130 /sys/netipsec/keysock.c | |
| parent | 7beb3e535d23cc0fe9278167a9c3dc67220250fd (diff) | |
| download | FreeBSD-src-95a15f5c8435d206ae030c1ed698f4fca6afdeae.zip FreeBSD-src-95a15f5c8435d206ae030c1ed698f4fca6afdeae.tar.gz | |
Merge more of currently non-functional (i.e. resolving to
whitespace) macros from p4/vimage branch.
Do a better job at enclosing all instantiations of globals
scheduled for virtualization in #ifdef VIMAGE_GLOBALS blocks.
De-virtualize and mark as const saorder_state_alive and
saorder_state_any arrays from ipsec code, given that they are never
updated at runtime, so virtualizing them would be pointless.
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
Diffstat (limited to 'sys/netipsec/keysock.c')
| -rw-r--r-- | sys/netipsec/keysock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 6d5c4bc..ace6993 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -76,7 +76,7 @@ static struct key_cb key_cb; struct pfkeystat pfkeystat; #endif -static struct sockaddr key_src = { 2, PF_KEY, }; +static struct sockaddr key_src = { 2, PF_KEY }; static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); @@ -166,7 +166,7 @@ key_sendup0(rp, m, promisc) V_pfkeystat.in_msgtype[pmsg->sadb_msg_type]++; } - if (!sbappendaddr(&rp->rcb_socket->so_rcv, (struct sockaddr *)&V_key_src, + if (!sbappendaddr(&rp->rcb_socket->so_rcv, (struct sockaddr *)&key_src, m, NULL)) { V_pfkeystat.in_nomem++; m_freem(m); |
