]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: usb: int51x1: use usbnet_cdc_update_filter
authorEthan Nelson-Moore <enelsonmoore@gmail.com>
Mon, 26 Jan 2026 04:40:39 +0000 (20:40 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 28 Jan 2026 01:55:32 +0000 (17:55 -0800)
The int51x1 driver uses the same requests as USB CDC to handle packet
filtering, but provides its own definitions and function to handle it.
The chip datasheet says the requests are CDC compliant. Replace this
unnecessary code with a reference to usbnet_cdc_update_filter.

Also fix the broken datasheet link and remove an empty comment.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Link: https://patch.msgid.link/20260126044049.40359-1-enelsonmoore@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/Kconfig
drivers/net/usb/int51x1.c

index 856e648d804e02642d156b97a4ce7a4df475e3a9..d050adfe860a6dbfaa1e4c8b9060038c914578ab 100644 (file)
@@ -564,6 +564,7 @@ config USB_HSO
 config USB_NET_INT51X1
        tristate "Intellon PLC based usb adapter"
        depends on USB_USBNET
+       select USB_NET_CDCETHER
        help
          Choose this option if you're using a 14Mb USB-based PLC
          (Powerline Communications) solution with an Intellon
index 6fde41550de1c71341e2b072e1336d2c3502eb5b..87bd6be1fcb66b3b38dd0acb2d77c670b6107c03 100644 (file)
@@ -4,14 +4,11 @@
  *
  * Intellon usb PLC (Powerline Communications) usb net driver
  *
- * http://www.tandel.be/downloads/INT51X1_Datasheet.pdf
+ * https://web.archive.org/web/20101025091240id_/http://www.tandel.be/downloads/INT51X1_Datasheet.pdf
  *
  * Based on the work of Jan 'RedBully' Seiffert
  */
 
-/*
- */
-
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/netdevice.h>
 
 #define INT51X1_HEADER_SIZE    2       /* 2 byte header */
 
-#define PACKET_TYPE_PROMISCUOUS                (1 << 0)
-#define PACKET_TYPE_ALL_MULTICAST      (1 << 1) /* no filter */
-#define PACKET_TYPE_DIRECTED           (1 << 2)
-#define PACKET_TYPE_BROADCAST          (1 << 3)
-#define PACKET_TYPE_MULTICAST          (1 << 4) /* filtered */
-
-#define SET_ETHERNET_PACKET_FILTER     0x43
-
 static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
        int len;
@@ -104,29 +93,6 @@ static struct sk_buff *int51x1_tx_fixup(struct usbnet *dev,
        return skb;
 }
 
-static void int51x1_set_multicast(struct net_device *netdev)
-{
-       struct usbnet *dev = netdev_priv(netdev);
-       u16 filter = PACKET_TYPE_DIRECTED | PACKET_TYPE_BROADCAST;
-
-       if (netdev->flags & IFF_PROMISC) {
-               /* do not expect to see traffic of other PLCs */
-               filter |= PACKET_TYPE_PROMISCUOUS;
-               netdev_info(dev->net, "promiscuous mode enabled\n");
-       } else if (!netdev_mc_empty(netdev) ||
-                 (netdev->flags & IFF_ALLMULTI)) {
-               filter |= PACKET_TYPE_ALL_MULTICAST;
-               netdev_dbg(dev->net, "receive all multicast enabled\n");
-       } else {
-               /* ~PROMISCUOUS, ~MULTICAST */
-               netdev_dbg(dev->net, "receive own packets only\n");
-       }
-
-       usbnet_write_cmd_async(dev, SET_ETHERNET_PACKET_FILTER,
-                              USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                              filter, 0, NULL, 0);
-}
-
 static const struct net_device_ops int51x1_netdev_ops = {
        .ndo_open               = usbnet_open,
        .ndo_stop               = usbnet_stop,
@@ -136,7 +102,7 @@ static const struct net_device_ops int51x1_netdev_ops = {
        .ndo_get_stats64        = dev_get_tstats64,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_rx_mode        = int51x1_set_multicast,
+       .ndo_set_rx_mode        = usbnet_set_rx_mode,
 };
 
 static int int51x1_bind(struct usbnet *dev, struct usb_interface *intf)
@@ -158,6 +124,7 @@ static const struct driver_info int51x1_info = {
        .bind        = int51x1_bind,
        .rx_fixup    = int51x1_rx_fixup,
        .tx_fixup    = int51x1_tx_fixup,
+       .set_rx_mode = usbnet_cdc_update_filter,
        .in          = 1,
        .out         = 2,
        .flags       = FLAG_ETHER,