Date: Fri, 4 Dec 2015 18:20:55 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> 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 Message-ID: <201512041820.tB4IKtnP019424@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512041820.tB4IKtnP019424>