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

cdc-ether: extract usbnet_cdc_update_filter function 



This will be used by the set_rx_mode callback.

Also move a comment about multicast filtering in this new function.

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

drivers/net/usb/cdc_ether.c

+28 −14
Original line number Diff line number Diff line
@@ -67,6 +67,32 @@ static const u8 mbm_guid[16] = { 
	0xa6, 0x07, 0xc0, 0xff, 0xcb, 0x7e, 0x39, 0x2a,

};



static void usbnet_cdc_update_filter(struct usbnet *dev)

{

	struct cdc_state	*info = (void *) &dev->data;

	struct usb_interface	*intf = info->control;



	u16 cdc_filter =

	    USB_CDC_PACKET_TYPE_ALL_MULTICAST | USB_CDC_PACKET_TYPE_DIRECTED |

	    USB_CDC_PACKET_TYPE_BROADCAST;



	/* FIXME cdc-ether has some multicast code too, though it complains

	 * in routine cases.  info->ether describes the multicast support.

	 * Implement that here, manipulating the cdc filter as needed.

	 */



	usb_control_msg(dev->udev,

			usb_sndctrlpipe(dev->udev, 0),

			USB_CDC_SET_ETHERNET_PACKET_FILTER,

			USB_TYPE_CLASS | USB_RECIP_INTERFACE,

			cdc_filter,

			intf->cur_altsetting->desc.bInterfaceNumber,

			NULL,

			0,

			USB_CTRL_SET_TIMEOUT

		);

}



/* probes control interface, claims data interface, collects the bulk

 * endpoints, activates data interface (if needed), maybe sets MTU.

 * all pure cdc, except for certain firmware workarounds, and knowing
@@ -347,16 +373,8 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) 
	 * don't do reset all the way. So the packet filter should

	 * be set to a sane initial value.

	 */

	usb_control_msg(dev->udev,

			usb_sndctrlpipe(dev->udev, 0),

			USB_CDC_SET_ETHERNET_PACKET_FILTER,

			USB_TYPE_CLASS | USB_RECIP_INTERFACE,

			USB_CDC_PACKET_TYPE_ALL_MULTICAST | USB_CDC_PACKET_TYPE_DIRECTED | USB_CDC_PACKET_TYPE_BROADCAST,

			intf->cur_altsetting->desc.bInterfaceNumber,

			NULL,

			0,

			USB_CTRL_SET_TIMEOUT

		);

	usbnet_cdc_update_filter(dev);



	return 0;



bad_desc:
@@ -468,10 +486,6 @@ int usbnet_cdc_bind(struct usbnet *dev, struct usb_interface *intf) 
		return status;

	}



	/* FIXME cdc-ether has some multicast code too, though it complains

	 * in routine cases.  info->ether describes the multicast support.

	 * Implement that here, manipulating the cdc filter as needed.

	 */

	return 0;

}

EXPORT_SYMBOL_GPL(usbnet_cdc_bind);