| commit | 9c412942a0bb19ba18f7bd939d42eff1e132a901 | |
| author | Ben Hutchings <bhutchings@solarflare.com> | |
| Tue, 3 May 2011 07:49:25 +0000 (3 07:49 +0000) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Sun, 8 May 2011 22:45:13 +0000 (8 15:45 -0700) | ||
| tree | 03b789e7a2aee88dcad4a63cecf90c1b9a526629 | treesnapshot (tar.gz zip) |
| parent | e328d410826d52e9ee348aff9064c4a207f2adb1 | commitdiff |
ipheth: Properly distinguish length and alignment in URBs and skbs
The USB protocol this driver implements appears to require 2 bytes of
padding in front of each received packet. This used to be equal to
the value of NET_IP_ALIGN on x86, so the driver abused that constant
and mostly worked, but this is no longer the case. The driver also
mixed up the URB and packet lengths, resulting in 2 bytes of junk at
the end of the skb.
Introduce a private constant for the 2 bytes of padding; fix this
confusion and check for the under-length case.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
The USB protocol this driver implements appears to require 2 bytes of
padding in front of each received packet. This used to be equal to
the value of NET_IP_ALIGN on x86, so the driver abused that constant
and mostly worked, but this is no longer the case. The driver also
mixed up the URB and packet lengths, resulting in 2 bytes of junk at
the end of the skb.
Introduce a private constant for the 2 bytes of padding; fix this
confusion and check for the under-length case.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| drivers/net/usb/ipheth.c | diffblobblamehistory |