diff options
| author | Steve Glendinning <steve.glendinning@shawell.net> | 2012-11-30 06:55:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-30 18:27:20 +0100 |
| commit | 068bb1a75a94eacfaaacf3b0ecf4feb349fa8e13 (patch) | |
| tree | 552f539a507de003e6094b0e254dd0a37c48ea7f /drivers/net/usb/smsc95xx.c | |
| parent | smsc95xx: don't enable remote wakeup directly (diff) | |
| download | linux-068bb1a75a94eacfaaacf3b0ecf4feb349fa8e13.tar.xz linux-068bb1a75a94eacfaaacf3b0ecf4feb349fa8e13.zip | |
smsc95xx: fix smsc_crc return type
This patch fixes a bug introduced in bbd9f9e which could prevent
some wakeups from working correctly if multiple wol options were
selected.
This helper function calculates a 16-bit crc and shifts it into
either the high or low 16 bits of a u32 so the caller can or it
directly into place. The function previously had a u16 return
type so would always have returned zero when filter was odd.
Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
Reported-by: Bjorn Mork <bjorn@mork.no>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/smsc95xx.c')
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 064df1af0df3..b9eb490afa45 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1074,9 +1074,10 @@ static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf) } } -static u16 smsc_crc(const u8 *buffer, size_t len, int filter) +static u32 smsc_crc(const u8 *buffer, size_t len, int filter) { - return bitrev16(crc16(0xFFFF, buffer, len)) << ((filter % 2) * 16); + u32 crc = bitrev16(crc16(0xFFFF, buffer, len)); + return crc << ((filter % 2) * 16); } static int smsc95xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask) |