Deleted Added
full compact
in_pcb.c (269280) in_pcb.c (271386)
1/*-
2 * Copyright (c) 1982, 1986, 1991, 1993, 1995
3 * The Regents of the University of California.
4 * Copyright (c) 2007-2009 Robert N. M. Watson
5 * Copyright (c) 2010-2011 Juniper Networks, Inc.
6 * All rights reserved.
7 *
8 * Portions of this software were developed by Robert N. M. Watson under

--- 22 unchanged lines hidden (view full) ---

31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95
36 */
37
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1982, 1986, 1991, 1993, 1995
3 * The Regents of the University of California.
4 * Copyright (c) 2007-2009 Robert N. M. Watson
5 * Copyright (c) 2010-2011 Juniper Networks, Inc.
6 * All rights reserved.
7 *
8 * Portions of this software were developed by Robert N. M. Watson under

--- 22 unchanged lines hidden (view full) ---

31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/netinet/in_pcb.c 269280 2014-07-29 23:42:51Z hiren $");
39__FBSDID("$FreeBSD: head/sys/netinet/in_pcb.c 271386 2014-09-10 12:35:42Z ae $");
40
41#include "opt_ddb.h"
42#include "opt_ipsec.h"
43#include "opt_inet.h"
44#include "opt_inet6.h"
45#include "opt_pcbgroup.h"
46#include "opt_rss.h"
47

--- 1993 unchanged lines hidden (view full) ---

2041 INP_WLOCK_ASSERT(inp);
2042 INP_HASH_WLOCK_ASSERT(pcbinfo);
2043
2044 KASSERT((inp->inp_flags & INP_INHASHLIST) == 0,
2045 ("in_pcbinshash: INP_INHASHLIST"));
2046
2047#ifdef INET6
2048 if (inp->inp_vflag & INP_IPV6)
40
41#include "opt_ddb.h"
42#include "opt_ipsec.h"
43#include "opt_inet.h"
44#include "opt_inet6.h"
45#include "opt_pcbgroup.h"
46#include "opt_rss.h"
47

--- 1993 unchanged lines hidden (view full) ---

2041 INP_WLOCK_ASSERT(inp);
2042 INP_HASH_WLOCK_ASSERT(pcbinfo);
2043
2044 KASSERT((inp->inp_flags & INP_INHASHLIST) == 0,
2045 ("in_pcbinshash: INP_INHASHLIST"));
2046
2047#ifdef INET6
2048 if (inp->inp_vflag & INP_IPV6)
2049 hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
2049 hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr);
2050 else
2051#endif
2052 hashkey_faddr = inp->inp_faddr.s_addr;
2053
2054 pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
2055 inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)];
2056
2057 pcbporthash = &pcbinfo->ipi_porthashbase[

--- 70 unchanged lines hidden (view full) ---

2128 INP_WLOCK_ASSERT(inp);
2129 INP_HASH_WLOCK_ASSERT(pcbinfo);
2130
2131 KASSERT(inp->inp_flags & INP_INHASHLIST,
2132 ("in_pcbrehash: !INP_INHASHLIST"));
2133
2134#ifdef INET6
2135 if (inp->inp_vflag & INP_IPV6)
2050 else
2051#endif
2052 hashkey_faddr = inp->inp_faddr.s_addr;
2053
2054 pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
2055 inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)];
2056
2057 pcbporthash = &pcbinfo->ipi_porthashbase[

--- 70 unchanged lines hidden (view full) ---

2128 INP_WLOCK_ASSERT(inp);
2129 INP_HASH_WLOCK_ASSERT(pcbinfo);
2130
2131 KASSERT(inp->inp_flags & INP_INHASHLIST,
2132 ("in_pcbrehash: !INP_INHASHLIST"));
2133
2134#ifdef INET6
2135 if (inp->inp_vflag & INP_IPV6)
2136 hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
2136 hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr);
2137 else
2138#endif
2139 hashkey_faddr = inp->inp_faddr.s_addr;
2140
2141 head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
2142 inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)];
2143
2144 LIST_REMOVE(inp, inp_hash);

--- 485 unchanged lines hidden ---
2137 else
2138#endif
2139 hashkey_faddr = inp->inp_faddr.s_addr;
2140
2141 head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
2142 inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)];
2143
2144 LIST_REMOVE(inp, inp_hash);

--- 485 unchanged lines hidden ---