D46523.id142857.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46523.id142857.diff
View Options

	diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
	--- a/sys/dev/bxe/bxe.c
	+++ b/sys/dev/bxe/bxe.c
	@@ -12174,7 +12174,7 @@
	if (if_getflags(ifp) & IFF_PROMISC) {
	rx_mode = BXE_RX_MODE_PROMISC;
	} else if ((if_getflags(ifp) & IFF_ALLMULTI) \|\|
	- ((if_getamcount(ifp) > BXE_MAX_MULTICAST) &&
	+ (if_llmaddr_count(ifp) > BXE_MAX_MULTICAST &&
	CHIP_IS_E1(sc))) {
	rx_mode = BXE_RX_MODE_ALLMULTI;
	} else {
	diff --git a/sys/dev/liquidio/lio_ioctl.c b/sys/dev/liquidio/lio_ioctl.c
	--- a/sys/dev/liquidio/lio_ioctl.c
	+++ b/sys/dev/liquidio/lio_ioctl.c
	@@ -481,7 +481,7 @@
	* Accept all multicast addresses if there are more than we
	* can handle
	*/
	- if (if_getamcount(ifp) > LIO_MAX_MULTICAST_ADDR)
	+ if (if_llmaddr_count(ifp) > LIO_MAX_MULTICAST_ADDR)
	f \|= LIO_IFFLAG_ALLMULTI;
	}
	if (if_getflags(ifp) & IFF_BROADCAST)
	diff --git a/sys/net/if.c b/sys/net/if.c
	--- a/sys/net/if.c
	+++ b/sys/net/if.c
	@@ -4780,12 +4780,6 @@
	return (ifp->if_addr);
	}

	-int
	-if_getamcount(const if_t ifp)
	-{
	- return (ifp->if_amcount);
	-}
	-
	int
	if_setsendqready(if_t ifp)
	{
	diff --git a/sys/net/if_var.h b/sys/net/if_var.h
	--- a/sys/net/if_var.h
	+++ b/sys/net/if_var.h
	@@ -675,7 +675,6 @@
	u_int if_llmaddr_count(if_t);
	bool if_maddr_empty(if_t);

	-int if_getamcount(const if_t ifp);
	struct ifaddr * if_getifaddr(const if_t ifp);
	typedef u_int if_addr_cb_t(void , struct ifaddr , u_int);
	u_int if_foreach_addr_type(if_t ifp, int type, if_addr_cb_t cb, void *cb_arg);