Author: davidcs
Date: Thu Oct 5 19:01:47 2017
New Revision: 324332
URL: https://svnweb.freebsd.org/changeset/base/324332
Log:
MFC r324026
Fix delete all multicast addresses
Submitted by: anand.kh...@cavium.com
Modified:
stable/9/sys/dev/qlxgbe/ql_glbl.h
stable/9/sys/dev/qlxgbe/ql_hw.c
stable/9/sys/dev/qlxgbe/ql_os.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/sys/dev/qlxgbe/ql_glbl.h
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_glbl.h Thu Oct 5 19:00:22 2017
(r324331)
+++ stable/9/sys/dev/qlxgbe/ql_glbl.h Thu Oct 5 19:01:47 2017
(r324332)
@@ -75,6 +75,7 @@ extern int ql_hw_check_health(qla_host_t *ha);
extern void qla_hw_async_event(qla_host_t *ha);
extern int qla_get_nic_partition(qla_host_t *ha, uint32_t *supports_9kb,
uint32_t *num_rcvq);
+extern int qla_hw_del_all_mcast(qla_host_t *ha);
extern int ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp);
extern void ql_minidump(qla_host_t *ha);
Modified: stable/9/sys/dev/qlxgbe/ql_hw.c
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_hw.c Thu Oct 5 19:00:22 2017
(r324331)
+++ stable/9/sys/dev/qlxgbe/ql_hw.c Thu Oct 5 19:01:47 2017
(r324332)
@@ -64,7 +64,6 @@ static int qla_link_event_req(qla_host_t *ha, uint16_t
static int qla_tx_tso(qla_host_t *ha, struct mbuf *mp, q80_tx_cmd_t *tx_cmd,
uint8_t *hdr);
static int qla_hw_add_all_mcast(qla_host_t *ha);
-static int qla_hw_del_all_mcast(qla_host_t *ha);
static int qla_add_rcv_rings(qla_host_t *ha, uint32_t sds_idx, uint32_t nsds);
static int qla_init_nic_func(qla_host_t *ha);
@@ -3413,7 +3412,7 @@ qla_hw_add_all_mcast(qla_host_t *ha)
return (ret);
}
-static int
+int
qla_hw_del_all_mcast(qla_host_t *ha)
{
int ret;
Modified: stable/9/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_os.c Thu Oct 5 19:00:22 2017
(r324331)
+++ stable/9/sys/dev/qlxgbe/ql_os.c Thu Oct 5 19:01:47 2017
(r324332)
@@ -980,7 +980,19 @@ qla_set_multi(qla_host_t *ha, uint32_t add_multi)
return (-1);
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
- ret = ql_hw_set_multi(ha, mta, mcnt, add_multi);
+
+ if (!add_multi) {
+ ret = qla_hw_del_all_mcast(ha);
+
+ if (ret)
+ device_printf(ha->pci_dev,
+ "%s: qla_hw_del_all_mcast() failed\n",
+ __func__);
+ }
+
+ if (!ret)
+ ret = ql_hw_set_multi(ha, mta, mcnt, 1);
+
}
QLA_UNLOCK(ha, __func__);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
