diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-10-21 08:24:12 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-10-21 08:24:12 +0000 |
| commit | 2e713a4fa04d3df76ea6f955e8e9c225c2df62a3 (patch) | |
| tree | ec9336f0848af00673ebf3c4246d8251abb546f0 /sys/ofed | |
| parent | 32b4feead705b6f99ad2bbb1cc6c440962802fd1 (diff) | |
| download | FreeBSD-src-2e713a4fa04d3df76ea6f955e8e9c225c2df62a3.zip FreeBSD-src-2e713a4fa04d3df76ea6f955e8e9c225c2df62a3.tar.gz | |
MFC r272683:
- Fix compile warning when compiling with GCC.
- Add missed chunk in previous driver code MFC.
Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/ofed')
| -rw-r--r-- | sys/ofed/drivers/net/mlx4/en_tx.c | 3 | ||||
| -rw-r--r-- | sys/ofed/drivers/net/mlx4/mlx4.h | 1 | ||||
| -rw-r--r-- | sys/ofed/include/linux/mlx4/device.h | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/sys/ofed/drivers/net/mlx4/en_tx.c b/sys/ofed/drivers/net/mlx4/en_tx.c index 10f3606..d193155 100644 --- a/sys/ofed/drivers/net/mlx4/en_tx.c +++ b/sys/ofed/drivers/net/mlx4/en_tx.c @@ -1028,9 +1028,6 @@ mlx4_en_transmit_locked(struct ifnet *dev, int tx_ind, struct mbuf *m) } drbr_advance(dev, ring->br); enqueued++; - dev->if_obytes += next->m_pkthdr.len; - if (next->m_flags & M_MCAST) - dev->if_omcasts++; if ((dev->if_drv_flags & IFF_DRV_RUNNING) == 0) break; } diff --git a/sys/ofed/drivers/net/mlx4/mlx4.h b/sys/ofed/drivers/net/mlx4/mlx4.h index 624a61c..47fde25 100644 --- a/sys/ofed/drivers/net/mlx4/mlx4.h +++ b/sys/ofed/drivers/net/mlx4/mlx4.h @@ -1234,6 +1234,7 @@ int mlx4_trans_to_dmfs_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], u8 port, int block_mcast_loopback, enum mlx4_protocol prot, u64 *reg_id); +int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode); int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr, struct mlx4_cmd_mailbox *inbox, diff --git a/sys/ofed/include/linux/mlx4/device.h b/sys/ofed/include/linux/mlx4/device.h index b0b5a3d..fa1631e 100644 --- a/sys/ofed/include/linux/mlx4/device.h +++ b/sys/ofed/include/linux/mlx4/device.h @@ -1210,7 +1210,6 @@ int mlx4_multicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port); int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port); int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port); int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port); -int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode); int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac); void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac); |
