aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2007-05-01 16:33:05 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-04 20:59:08 -0400
commitcfa08bb5ba6df4a76a67b7ddb9b2b549eda2458b (patch)
tree999a7120ea10bf0888886e0a9c190e3ec05f1884
parent318175766e7688ba52cdf771d37e98a1e4759f98 (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>
-rw-r--r--drivers/net/7990.c6
-rw-r--r--drivers/net/a2065.c4
-rw-r--r--drivers/net/sun3_82586.c5
3 files changed, 8 insertions, 7 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);
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 37534f3f8bf3..81d5a374042a 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -597,11 +597,11 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
597 ib->btx_ring [entry].length = (-len) | 0xf000; 597 ib->btx_ring [entry].length = (-len) | 0xf000;
598 ib->btx_ring [entry].misc = 0; 598 ib->btx_ring [entry].misc = 0;
599 599
600 skb_copy_from_linear_data(skb, &ib->tx_buf [entry][0], skblen); 600 skb_copy_from_linear_data(skb, (void *)&ib->tx_buf [entry][0], skblen);
601 601
602 /* Clear the slack of the packet, do I need this? */ 602 /* Clear the slack of the packet, do I need this? */
603 if (len != skblen) 603 if (len != skblen)
604 memset ((char *) &ib->tx_buf [entry][skblen], 0, len - skblen); 604 memset ((void *) &ib->tx_buf [entry][skblen], 0, len - skblen);
605 605
606 /* Now, give the packet to the lance */ 606 /* Now, give the packet to the lance */
607 ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); 607 ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);
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