diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-05-25 16:24:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-25 16:24:03 -0700 |
| commit | f925b1303e0672effc78547353bd2ddfe11f5b5f (patch) | |
| tree | ef5e4e19aa70fcf08d624fec1d5cc9a342c12136 /drivers/net/usb | |
| parent | be2net: Bug fix to avoid disabling bottom half during firmware upgrade. (diff) | |
| download | linux-dev-f925b1303e0672effc78547353bd2ddfe11f5b5f.tar.xz linux-dev-f925b1303e0672effc78547353bd2ddfe11f5b5f.zip | |
drivers/net/usb/asix.c: Fix pointer cast.
Stephen Rothwell reports the following new warning:
drivers/net/usb/asix.c: In function 'asix_rx_fixup':
drivers/net/usb/asix.c:325: warning: cast from pointer to integer of different size
drivers/net/usb/asix.c:354: warning: cast from pointer to integer of different size
The code just cares about the low alignment bits, so use
an "unsigned long" cast instead of one to "u32".
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/asix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 31b73310ec77..1f802e90474c 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -322,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) size = (u16) (header & 0x0000ffff); if ((skb->len) - ((size + 1) & 0xfffe) == 0) { - u8 alignment = (u32)skb->data & 0x3; + u8 alignment = (unsigned long)skb->data & 0x3; if (alignment != 0x2) { /* * not 16bit aligned so use the room provided by @@ -351,7 +351,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) } ax_skb = skb_clone(skb, GFP_ATOMIC); if (ax_skb) { - u8 alignment = (u32)packet & 0x3; + u8 alignment = (unsigned long)packet & 0x3; ax_skb->len = size; if (alignment != 0x2) { |