diff options
| author | hselasky <hselasky@FreeBSD.org> | 2015-12-04 18:20:55 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2015-12-04 18:20:55 +0000 |
| commit | 55287fc50de580564157174394bccdea58bf7766 (patch) | |
| tree | 1444de750d4dd412f4f37a8003d18f64e6e916b2 | |
| parent | 9cb329cc6d385b68fd0f2433ae79b9e5614439ad (diff) | |
| download | FreeBSD-src-55287fc50de580564157174394bccdea58bf7766.zip FreeBSD-src-55287fc50de580564157174394bccdea58bf7766.tar.gz | |
Fix i386 build WITH_OFED=YES. Remove some redundant KASSERTs.
Suggested by: kib, ian
Sponsored by: Mellanox Technologies
MFC after: 1 week
| -rw-r--r-- | sys/ofed/drivers/net/mlx4/en_rx.c | 3 | ||||
| -rw-r--r-- | sys/ofed/include/linux/mlx4/doorbell.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sys/ofed/drivers/net/mlx4/en_rx.c b/sys/ofed/drivers/net/mlx4/en_rx.c index 21282c6..7c5b759 100644 --- a/sys/ofed/drivers/net/mlx4/en_rx.c +++ b/sys/ofed/drivers/net/mlx4/en_rx.c @@ -96,8 +96,6 @@ mlx4_en_alloc_buf(struct mlx4_en_rx_ring *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 *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; diff --git a/sys/ofed/include/linux/mlx4/doorbell.h b/sys/ofed/include/linux/mlx4/doorbell.h index f31bba2..6724e5e 100644 --- a/sys/ofed/include/linux/mlx4/doorbell.h +++ b/sys/ofed/include/linux/mlx4/doorbell.h @@ -77,7 +77,7 @@ static inline void mlx4_write64(__be32 val[2], void __iomem *dest, 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); } |
