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/sun3_82586.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/sun3_82586.c')
-rw-r--r-- | drivers/net/sun3_82586.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index 396c3d961f88..a123ea87893b 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
@@ -1023,10 +1023,11 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1023 | { | 1023 | { |
1024 | len = skb->len; | 1024 | len = skb->len; |
1025 | if (len < ETH_ZLEN) { | 1025 | if (len < ETH_ZLEN) { |
1026 | memset((char *)p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN); | 1026 | memset((void *)p->xmit_cbuffs[p->xmit_count], 0, |
1027 | ETH_ZLEN); | ||
1027 | len = ETH_ZLEN; | 1028 | len = ETH_ZLEN; |
1028 | } | 1029 | } |
1029 | skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len); | 1030 | skb_copy_from_linear_data(skb, (void *)p->xmit_cbuffs[p->xmit_count], skb->len); |
1030 | 1031 | ||
1031 | #if (NUM_XMIT_BUFFS == 1) | 1032 | #if (NUM_XMIT_BUFFS == 1) |
1032 | # ifdef NO_NOPCOMMANDS | 1033 | # ifdef NO_NOPCOMMANDS |