d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix i386 build WITH_OFED=YES. Remove some redundant KASSERTs.

Browse Source 
Suggested by:	kib, ian
Sponsored by:	Mellanox Technologies
MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2015-12-04 18:20:55 +00:00
parent df5b54dee1
commit c5e5a55f8f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/ofed/drivers/net/mlx4/en_rx.c
View File

@ -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;

2
sys/ofed/include/linux/mlx4/doorbell.h
View File

@ -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);
}