From owner-svn-src-all@freebsd.org Fri Dec 4 18:20:56 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E515A41AD4; Fri, 4 Dec 2015 18:20:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3AFED18A2; Fri, 4 Dec 2015 18:20:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB4IKtbw019426; Fri, 4 Dec 2015 18:20:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB4IKtnP019424; Fri, 4 Dec 2015 18:20:55 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201512041820.tB4IKtnP019424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 4 Dec 2015 18:20:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291793 - in head/sys/ofed: drivers/net/mlx4 include/linux/mlx4 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.20 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, 04 Dec 2015 18:20:56 -0000 Author: hselasky Date: Fri Dec 4 18:20:55 2015 New Revision: 291793 URL: https://svnweb.freebsd.org/changeset/base/291793 Log: Fix i386 build WITH_OFED=YES. Remove some redundant KASSERTs. Suggested by: kib, ian Sponsored by: Mellanox Technologies MFC after: 1 week Modified: head/sys/ofed/drivers/net/mlx4/en_rx.c head/sys/ofed/include/linux/mlx4/doorbell.h Modified: head/sys/ofed/drivers/net/mlx4/en_rx.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/en_rx.c Fri Dec 4 18:14:31 2015 (r291792) +++ head/sys/ofed/drivers/net/mlx4/en_rx.c Fri Dec 4 18:20:55 2015 (r291793) @@ -96,8 +96,6 @@ mlx4_en_alloc_buf(struct mlx4_en_rx_ring m_freem(mb); return (err); } - KASSERT(nsegs == 1, - ("Number of segments is expected to be one")); /* store spare info */ ring->spare.mbuf = mb; @@ -127,7 +125,6 @@ mlx4_en_alloc_buf(struct mlx4_en_rx_ring m_freem(mb); goto use_spare; } - KASSERT(nsegs == 1, ("Number of segments is expected to be one")); *pdma = cpu_to_be64(segs[0].ds_addr); mb_list->mbuf = mb; Modified: head/sys/ofed/include/linux/mlx4/doorbell.h ============================================================================== --- head/sys/ofed/include/linux/mlx4/doorbell.h Fri Dec 4 18:14:31 2015 (r291792) +++ head/sys/ofed/include/linux/mlx4/doorbell.h Fri Dec 4 18:20:55 2015 (r291793) @@ -77,7 +77,7 @@ static inline void mlx4_write64(__be32 v spin_lock_irqsave(doorbell_lock, flags); __raw_writel((__force u32) val[0], dest); - __raw_writel((__force u32) val[1], dest + 4); + __raw_writel((__force u32) val[1], (u8 *)dest + 4); spin_unlock_irqrestore(doorbell_lock, flags); }