Commit e748d0fd authored by Ravi Gunasekaran's avatar Ravi Gunasekaran Committed by Jakub Kicinski
Browse files

net: hsr: Disable promiscuous mode in offload mode 



When port-to-port forwarding for interfaces in HSR node is enabled,
disable promiscuous mode since L2 frame forward happens at the
offloaded hardware.

Signed-off-by: default avatarRavi Gunasekaran <r-gunasekaran@ti.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230614114710.31400-1-r-gunasekaran@ti.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ff9b63c8

net/hsr/hsr_device.c

+5 −0
Original line number Diff line number Diff line
@@ -531,6 +531,11 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 
	if (res)

		goto err_add_master;



	/* HSR forwarding offload supported in lower device? */

	if ((slave[0]->features & NETIF_F_HW_HSR_FWD) &&

	    (slave[1]->features & NETIF_F_HW_HSR_FWD))

		hsr->fwd_offloaded = true;



	res = register_netdevice(hsr_dev);

	if (res)

		goto err_unregister;

net/hsr/hsr_main.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ struct hsr_priv { 
	u8 net_id;		/* for PRP, it occupies most significant 3 bits

				 * of lan_id

				 */

	bool fwd_offloaded;	/* Forwarding offloaded to HW */

	unsigned char		sup_multicast_addr[ETH_ALEN] __aligned(sizeof(u16));

				/* Align to u16 boundary to avoid unaligned access

				 * in ether_addr_equal

net/hsr/hsr_slave.c

+11 −4
Original line number Diff line number Diff line
@@ -131,9 +131,14 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev, 
	struct hsr_port *master;

	int res;



	/* Don't use promiscuous mode for offload since L2 frame forward

	 * happens at the offloaded hardware.

	 */

	if (!port->hsr->fwd_offloaded) {

		res = dev_set_promiscuity(dev, 1);

		if (res)

			return res;

	}



	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);

	hsr_dev = master->dev;
@@ -152,7 +157,9 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev, 
fail_rx_handler:

	netdev_upper_dev_unlink(dev, hsr_dev);

fail_upper_dev_link:

	if (!port->hsr->fwd_offloaded)

		dev_set_promiscuity(dev, -1);



	return res;

}