Author: hselasky
Date: Tue Oct 21 08:24:12 2014
New Revision: 273379
URL: https://svnweb.freebsd.org/changeset/base/273379
Log:
MFC r272683:
- Fix compile warning when compiling with GCC.
- Add missed chunk in previous driver code MFC.
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/ofed/drivers/net/mlx4/en_tx.c
stable/10/sys/ofed/drivers/net/mlx4/mlx4.h
stable/10/sys/ofed/include/linux/mlx4/device.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/ofed/drivers/net/mlx4/en_tx.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/en_tx.c Tue Oct 21 07:49:34 2014
(r273378)
+++ stable/10/sys/ofed/drivers/net/mlx4/en_tx.c Tue Oct 21 08:24:12 2014
(r273379)
@@ -1028,9 +1028,6 @@ mlx4_en_transmit_locked(struct ifnet *de
}
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;
}
Modified: stable/10/sys/ofed/drivers/net/mlx4/mlx4.h
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/mlx4.h Tue Oct 21 07:49:34 2014
(r273378)
+++ stable/10/sys/ofed/drivers/net/mlx4/mlx4.h Tue Oct 21 08:24:12 2014
(r273379)
@@ -1234,6 +1234,7 @@ int mlx4_trans_to_dmfs_attach(struct mlx
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,
Modified: stable/10/sys/ofed/include/linux/mlx4/device.h
==============================================================================
--- stable/10/sys/ofed/include/linux/mlx4/device.h Tue Oct 21 07:49:34
2014 (r273378)
+++ stable/10/sys/ofed/include/linux/mlx4/device.h Tue Oct 21 08:24:12
2014 (r273379)
@@ -1210,7 +1210,6 @@ int mlx4_multicast_promisc_add(struct ml
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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
