diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2007-05-01 22:33:05 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:59:08 -0700 |
commit | cfa08bb5ba6df4a76a67b7ddb9b2b549eda2458b (patch) | |
tree | 999a7120ea10bf0888886e0a9c190e3ec05f1884 /drivers/net/sun3_82586.c | |
parent | 318175766e7688ba52cdf771d37e98a1e4759f98 (diff) | |
download | kernel_samsung_smdk4412-cfa08bb5ba6df4a76a67b7ddb9b2b549eda2458b.zip kernel_samsung_smdk4412-cfa08bb5ba6df4a76a67b7ddb9b2b549eda2458b.tar.gz kernel_samsung_smdk4412-cfa08bb5ba6df4a76a67b7ddb9b2b549eda2458b.tar.bz2 |
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 396c3d9..a123ea8 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) { len = skb->len; if (len < ETH_ZLEN) { - memset((char *)p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN); + memset((void *)p->xmit_cbuffs[p->xmit_count], 0, + ETH_ZLEN); len = ETH_ZLEN; } - skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len); + skb_copy_from_linear_data(skb, (void *)p->xmit_cbuffs[p->xmit_count], skb->len); #if (NUM_XMIT_BUFFS == 1) # ifdef NO_NOPCOMMANDS |