diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2013-12-16 11:35:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-18 17:46:55 -0500 |
| commit | 407900cfb54bdb2cfa228010b6697305f66b2948 (patch) | |
| tree | bfb3b1c7be537ae41fe7608aadf0db243bdff59d /drivers/net/usb/dm9601.c | |
| parent | 3b3878926c7679765635ed2803dd694a8658042d (diff) | |
| download | blackbird-op-linux-407900cfb54bdb2cfa228010b6697305f66b2948.tar.gz blackbird-op-linux-407900cfb54bdb2cfa228010b6697305f66b2948.zip | |
dm9601: fix reception of full size ethernet frames on dm9620/dm9621a
dm9620/dm9621a require room for 4 byte padding even in dm9601 (3 byte
header) mode.
Cc: <stable@vger.kernel.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/dm9601.c')
| -rw-r--r-- | drivers/net/usb/dm9601.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 8e885729aa28..aca0285d18bf 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -364,7 +364,12 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->ethtool_ops = &dm9601_ethtool_ops; dev->net->hard_header_len += DM_TX_OVERHEAD; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; - dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD; + + /* dm9620/21a require room for 4 byte padding, even in dm9601 + * mode, so we need +1 to be able to receive full size + * ethernet frames. + */ + dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD + 1; dev->mii.dev = dev->net; dev->mii.mdio_read = dm9601_mdio_read; |
