diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2007-05-01 16:33:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:59:08 -0400 |
commit | cfa08bb5ba6df4a76a67b7ddb9b2b549eda2458b (patch) | |
tree | 999a7120ea10bf0888886e0a9c190e3ec05f1884 /drivers/net/7990.c | |
parent | 318175766e7688ba52cdf771d37e98a1e4759f98 (diff) |
m68k: kill skb_copy_from_linear_data compiler warnings
The recent conversion from `memcpy' to `skb_copy_from_linear_data' removed a
few casts, which were needed to silence compiler warnings. Re-add them.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/7990.c')
-rw-r--r-- | drivers/net/7990.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index d396f996af57..0877fc372f4b 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
@@ -565,9 +565,9 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
565 | ib->btx_ring [entry].length = (-len) | 0xf000; | 565 | ib->btx_ring [entry].length = (-len) | 0xf000; |
566 | ib->btx_ring [entry].misc = 0; | 566 | ib->btx_ring [entry].misc = 0; |
567 | 567 | ||
568 | if (skb->len < ETH_ZLEN) | 568 | if (skb->len < ETH_ZLEN) |
569 | memset((char *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); | 569 | memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); |
570 | skb_copy_from_linear_data(skb, &ib->tx_buf[entry][0], skblen); | 570 | skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen); |
571 | 571 | ||
572 | /* Now, give the packet to the lance */ | 572 | /* Now, give the packet to the lance */ |
573 | ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); | 573 | ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); |