Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1efed2d0 authored by Olivier Blin's avatar Olivier Blin Committed by David S. Miller
Browse files

usbnet: add a callback for set_rx_mode 



To delegate promiscuous mode and multicast filtering to the subdriver.

Signed-off-by: default avatarOlivier Blin <olivier.blin@softathome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ffa1fca

drivers/net/usb/usbnet.c

+20 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,21 @@ static void __handle_link_change(struct usbnet *dev) 
	clear_bit(EVENT_LINK_CHANGE, &dev->flags);

}



static void usbnet_set_rx_mode(struct net_device *net)

{

	struct usbnet		*dev = netdev_priv(net);



	usbnet_defer_kevent(dev, EVENT_SET_RX_MODE);

}



static void __handle_set_rx_mode(struct usbnet *dev)

{

	if (dev->driver_info->set_rx_mode)

		(dev->driver_info->set_rx_mode)(dev);



	clear_bit(EVENT_SET_RX_MODE, &dev->flags);

}



/* work that cannot be done in interrupt context uses keventd.

 *

 * NOTE:  with 2.5 we could do more of this using completion callbacks,
@@ -1157,6 +1172,10 @@ kevent (struct work_struct *work) 
	if (test_bit (EVENT_LINK_CHANGE, &dev->flags))

		__handle_link_change(dev);



	if (test_bit (EVENT_SET_RX_MODE, &dev->flags))

		__handle_set_rx_mode(dev);





	if (dev->flags)

		netdev_dbg(dev->net, "kevent done, flags = 0x%lx\n", dev->flags);

}
@@ -1525,6 +1544,7 @@ static const struct net_device_ops usbnet_netdev_ops = { 
	.ndo_stop		= usbnet_stop,

	.ndo_start_xmit		= usbnet_start_xmit,

	.ndo_tx_timeout		= usbnet_tx_timeout,

	.ndo_set_rx_mode	= usbnet_set_rx_mode,

	.ndo_change_mtu		= usbnet_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

include/linux/usb/usbnet.h

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct usbnet { 
#		define EVENT_NO_RUNTIME_PM	9

#		define EVENT_RX_KILL	10

#		define EVENT_LINK_CHANGE	11

#		define EVENT_SET_RX_MODE	12

};



static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -159,6 +160,9 @@ struct driver_info { 
	/* called by minidriver when receiving indication */

	void	(*indication)(struct usbnet *dev, void *ind, int indlen);



	/* rx mode change (device changes address list filtering) */

	void	(*set_rx_mode)(struct usbnet *dev);



	/* for new devices, use the descriptor-reading code instead */

	int		in;		/* rx endpoint */

	int		out;		/* tx endpoint */