| Message ID | 05205f33-1e1a-663c-c43d-8ce3f4e2a32f@det.uvigo.gal (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fr, 2018-06-29 at 16:45 +0200, Miguel Rodríguez Pérez wrote: > Subject: [PATCH 1/2] Hook into usbnet_change_mtu respecting usbnet > driver_info > > Change the way cdc_ncm_change_mtu hooks into the netdev_ops > structure so that changes into usbnet driver_info operations > can be respected. Without this, is was not possible to hook > into usbnet_set_rx_mode. Hi, what is wrong with the existing hook? 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); } If you cannot use it, I would prefer you to actually fix that. Regards Oliver -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
There is nothing wrong with it, but there was no way cdc_ncm driver could use it, as it currently overwrites the struct net_device_ops, so the usbnet function set_rx_mode was not ever getting called. This patch restores the right behavior, so that usbnet's set _rx_mode gets called again for cdn_ncm devices. The second patch (the one with the wrong subject) hooks into set_rx_mode to accept multicast traffic when asked to do so. Regards. On 29/06/18 22:37, Oliver Neukum wrote: > On Fr, 2018-06-29 at 16:45 +0200, Miguel Rodríguez Pérez wrote: >> Subject: [PATCH 1/2] Hook into usbnet_change_mtu respecting usbnet >> driver_info >> >> Change the way cdc_ncm_change_mtu hooks into the netdev_ops >> structure so that changes into usbnet driver_info operations >> can be respected. Without this, is was not possible to hook >> into usbnet_set_rx_mode. > > Hi, > > what is wrong with the existing hook? > > 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); > } > > If you cannot use it, I would prefer you to actually fix that. > > Regards > Oliver >
There is nothing wrong with it, but there was no way cdc_ncm driver could use it, as it currently overwrites the struct net_device_ops, so the usbnet function set_rx_mode was not ever getting called. This patch restores the right behavior, so that usbnet's set _rx_mode gets called again for cdn_ncm devices. The second patch (the one with the wrong subject) hooks into set_rx_mode to accept multicast traffic when asked to do so. Regards. On 29/06/18 22:37, Oliver Neukum wrote: > On Fr, 2018-06-29 at 16:45 +0200, Miguel Rodríguez Pérez wrote: >> Subject: [PATCH 1/2] Hook into usbnet_change_mtu respecting usbnet >> driver_info >> >> Change the way cdc_ncm_change_mtu hooks into the netdev_ops >> structure so that changes into usbnet driver_info operations >> can be respected. Without this, is was not possible to hook >> into usbnet_set_rx_mode. > > Hi, > > what is wrong with the existing hook? > > 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); > } > > If you cannot use it, I would prefer you to actually fix that. > > Regards > Oliver >
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 9e1b74590682..d6b51e2b9495 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -750,16 +750,7 @@ int cdc_ncm_change_mtu(struct net_device *net, int new_mtu) } EXPORT_SYMBOL_GPL(cdc_ncm_change_mtu); -static const struct net_device_ops cdc_ncm_netdev_ops = { - .ndo_open = usbnet_open, - .ndo_stop = usbnet_stop, - .ndo_start_xmit = usbnet_start_xmit, - .ndo_tx_timeout = usbnet_tx_timeout, - .ndo_get_stats64 = usbnet_get_stats64, - .ndo_change_mtu = cdc_ncm_change_mtu, - .ndo_set_mac_address = eth_mac_addr, - .ndo_validate_addr = eth_validate_addr, -}; +static struct net_device_ops cdc_ncm_netdev_ops; int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf,
Subject: [PATCH 1/2] Hook into usbnet_change_mtu respecting usbnet driver_info Change the way cdc_ncm_change_mtu hooks into the netdev_ops structure so that changes into usbnet driver_info operations can be respected. Without this, is was not possible to hook into usbnet_set_rx_mode. Signed-off-by: Miguel Rodríguez Pérez <miguel@det.uvigo.gal> --- drivers/net/usb/cdc_ncm.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) u8 data_altsetting, int drvflags) { @@ -939,6 +930,8 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ dev->net->sysfs_groups[0] = &cdc_ncm_sysfs_attr_group; /* must handle MTU changes */ + cdc_ncm_netdev_ops = *dev->net->netdev_ops; + cdc_ncm_netdev_ops.ndo_change_mtu = cdc_ncm_change_mtu; dev->net->netdev_ops = &cdc_ncm_netdev_ops; dev->net->max_mtu = cdc_ncm_max_dgram_size(dev) - cdc_ncm_eth_hlen(dev);