Skip to content

Commit

Permalink
drivers/net/usb/asix.c: Fix pointer cast.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed May 25, 2010
1 parent dd131e7 commit f925b13
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/usb/asix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit f925b13

Please sign in to comment.