From owner-svn-src-all@FreeBSD.ORG Fri Jul 18 07:41:38 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B32F73E8; Fri, 18 Jul 2014 07:41:38 +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 A142724D4; Fri, 18 Jul 2014 07:41:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6I7fc0b003676; Fri, 18 Jul 2014 07:41:38 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6I7fcJn003675; Fri, 18 Jul 2014 07:41:38 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201407180741.s6I7fcJn003675@svn.freebsd.org> From: Peter Wemm Date: Fri, 18 Jul 2014 07:41:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268833 - head/sys/dev/bge X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jul 2014 07:41:38 -0000 Author: peter Date: Fri Jul 18 07:41:38 2014 New Revision: 268833 URL: http://svnweb.freebsd.org/changeset/base/268833 Log: Fix an apparent conversion error in bge to the new driver api. if_multiaddr_array() does the LLADDR work, don't do it twice. This broke IPv6 in "interesting" ways in the FreeBSD.org cluster. Modified: head/sys/dev/bge/if_bge.c Modified: head/sys/dev/bge/if_bge.c ============================================================================== --- head/sys/dev/bge/if_bge.c Fri Jul 18 07:18:37 2014 (r268832) +++ head/sys/dev/bge/if_bge.c Fri Jul 18 07:41:38 2014 (r268833) @@ -1646,8 +1646,8 @@ bge_setmulti(struct bge_softc *sc) if_multiaddr_array(ifp, mta, &mcnt, mc_count); for(i = 0; i < mcnt; i++) { - h = ether_crc32_le(LLADDR((struct sockaddr_dl *) - (mta + (i * ETHER_ADDR_LEN))), ETHER_ADDR_LEN) & 0x7F; + h = ether_crc32_le(mta + (i * ETHER_ADDR_LEN), + ETHER_ADDR_LEN) & 0x7F; hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F); }