net: asix: handle packets crossing URB boundaries

ASIX AX88772B started to pack data even more tightly. Packets and the ASIX packet
header may now cross URB boundaries. To handle this we have to introduce
some state between individual calls to asix_rx_fixup().

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 0ecc3bc6c3d7..37de7db56d63 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -495,9 +495,19 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
                 dev->rx_urb_size = 2048;
         }
 
+        dev->driver_priv = kzalloc(sizeof(struct asix_common_private), GFP_KERNEL);
+        if (!dev->driver_priv)
+                return -ENOMEM;
+
         return 0;
 }
 
+void ax88772_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+        if (dev->driver_priv)
+                kfree(dev->driver_priv);
+}
+
 static const struct ethtool_ops ax88178_ethtool_ops = {
         .get_drvinfo            = asix_get_drvinfo,
         .get_link               = asix_get_link,
@@ -829,6 +839,10 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
                 dev->rx_urb_size = 2048;
         }
 
+        dev->driver_priv = kzalloc(sizeof(struct asix_common_private), GFP_KERNEL);
+        if (!dev->driver_priv)
+                        return -ENOMEM;
+
         return 0;
 }
 
@@ -875,23 +889,25 @@ static const struct driver_info hawking_uf200_info = {
 static const struct driver_info ax88772_info = {
         .description = "ASIX AX88772 USB 2.0 Ethernet",
         .bind = ax88772_bind,
+        .unbind = ax88772_unbind,
         .status = asix_status,
         .link_reset = ax88772_link_reset,
         .reset = ax88772_reset,
         .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET,
-        .rx_fixup = asix_rx_fixup,
+        .rx_fixup = asix_rx_fixup_common,
         .tx_fixup = asix_tx_fixup,
 };
 
 static const struct driver_info ax88772b_info = {
         .description = "ASIX AX88772B USB 2.0 Ethernet",
         .bind = ax88772_bind,
+        .unbind = ax88772_unbind,
         .status = asix_status,
         .link_reset = ax88772_link_reset,
         .reset = ax88772_reset,
         .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
                  FLAG_MULTI_PACKET,
-        .rx_fixup = asix_rx_fixup,
+        .rx_fixup = asix_rx_fixup_common,
         .tx_fixup = asix_tx_fixup,
         .data = FLAG_EEPROM_MAC,
 };
@@ -899,11 +915,12 @@ static const struct driver_info ax88772b_info = {
 static const struct driver_info ax88178_info = {
         .description = "ASIX AX88178 USB 2.0 Ethernet",
         .bind = ax88178_bind,
+        .unbind = ax88772_unbind,
         .status = asix_status,
         .link_reset = ax88178_link_reset,
         .reset = ax88178_reset,
         .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
-        .rx_fixup = asix_rx_fixup,
+        .rx_fixup = asix_rx_fixup_common,
         .tx_fixup = asix_tx_fixup,
 };