diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-12-13 21:31:49 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 15:14:59 +0100 |
| commit | 688f897ddd96968cf59a2d67afe2a394a0bf8ab3 (patch) | |
| tree | e303dd2f94a5c670a318008c891674e116558e6b /drivers/net/usb/cdc_ether.c | |
| parent | a898b45a9c18bd9d723f82576a5b32a102808a09 (diff) | |
| parent | fb2d2dee504a963efdcb76517b5cdf25444cf535 (diff) | |
Merge remote-tracking branch 'linux-fslc/4.9-1.0.x-imx' into toradex_4.9-1.0.x-imx-next
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index b82be816256c..1fca0024f294 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -221,7 +221,7 @@ skip: goto bad_desc; } - if (header.usb_cdc_ether_desc) { + if (header.usb_cdc_ether_desc && info->ether->wMaxSegmentSize) { dev->hard_mtu = le16_to_cpu(info->ether->wMaxSegmentSize); /* because of Zaurus, we may be ignoring the host * side link address we were given. |