Module Name: src Committed By: ozaki-r Date: Thu Jun 22 09:23:10 UTC 2017
Modified Files: src/sys/netinet: in.c Log Message: Fix in_lltable_match_prefix The function has not been used but will be used soon. To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/sys/netinet/in.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/in.c diff -u src/sys/netinet/in.c:1.203 src/sys/netinet/in.c:1.204 --- src/sys/netinet/in.c:1.203 Thu Jun 1 02:45:14 2017 +++ src/sys/netinet/in.c Thu Jun 22 09:23:10 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: in.c,v 1.203 2017/06/01 02:45:14 chs Exp $ */ +/* $NetBSD: in.c,v 1.204 2017/06/22 09:23:10 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203 2017/06/01 02:45:14 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.204 2017/06/22 09:23:10 ozaki-r Exp $"); #include "arp.h" @@ -1896,12 +1896,15 @@ in_lltable_match_prefix(const struct soc { const struct sockaddr_in *pfx = (const struct sockaddr_in *)prefix; const struct sockaddr_in *msk = (const struct sockaddr_in *)mask; + struct in_addr lle_addr; + + lle_addr.s_addr = ntohl(lle->r_l3addr.addr4.s_addr); /* * (flags & LLE_STATIC) means deleting all entries * including static ARP entries. */ - if (IN_ARE_MASKED_ADDR_EQUAL(lle->r_l3addr.addr4, pfx, msk) && + if (IN_ARE_MASKED_ADDR_EQUAL(lle_addr, pfx, msk) && ((flags & LLE_STATIC) || !(lle->la_flags & LLE_STATIC))) return (1);