From owner-svn-src-projects@FreeBSD.ORG Sat Jan 3 13:41:54 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42EDC694; Sat, 3 Jan 2015 13:41:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FC491969; Sat, 3 Jan 2015 13:41:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t03DfskE055933; Sat, 3 Jan 2015 13:41:54 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t03DfsC1055932; Sat, 3 Jan 2015 13:41:54 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201501031341.t03DfsC1055932@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 3 Jan 2015 13:41:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276619 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jan 2015 13:41:54 -0000 Author: melifaro Date: Sat Jan 3 13:41:53 2015 New Revision: 276619 URL: https://svnweb.freebsd.org/changeset/base/276619 Log: Finish r275628: remove remaining 'base' references. Modified: projects/routing/sys/netinet/in.c Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sat Jan 3 13:36:56 2015 (r276618) +++ projects/routing/sys/netinet/in.c Sat Jan 3 13:41:53 2015 (r276619) @@ -1012,20 +1012,19 @@ in_lltable_new(struct in_addr addr4, u_i if (lle == NULL) /* NB: caller generates msg */ return NULL; - lle->base.r_l3addr.addr4 = addr4; + lle->r_l3addr.addr4 = addr4; /* * For IPv4 this will trigger "arpresolve" to generate * an ARP request. */ - lle->base.la_expire = time_uptime; /* mark expired */ - lle->base.lle_refcnt = 1; - lle->base.lle_free = in_lltable_free; - LLE_LOCK_INIT(&lle->base); - callout_init_rw(&lle->base.la_timer, &lle->base.lle_lock, - CALLOUT_RETURNUNLOCKED); + lle->la_expire = time_uptime; /* mark expired */ + lle->lle_refcnt = 1; + lle->lle_free = in_lltable_free; + LLE_LOCK_INIT(lle); + callout_init_rw(&lle->la_timer, &lle->lle_lock, CALLOUT_RETURNUNLOCKED); - return (&lle->base); + return (lle); } #define IN_ARE_MASKED_ADDR_EQUAL(d, a, m) ( \