Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa08bb5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 31817576

drivers/net/7990.c

+3 −3
Original line number Diff line number Diff line
@@ -566,8 +566,8 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) 
        ib->btx_ring [entry].misc = 0;



	if (skb->len < ETH_ZLEN)

    		memset((char *)&ib->tx_buf[entry][0], 0, ETH_ZLEN);

        skb_copy_from_linear_data(skb, &ib->tx_buf[entry][0], skblen);

		memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN);

        skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen);



        /* Now, give the packet to the lance */

        ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);

drivers/net/a2065.c

+2 −2
Original line number Diff line number Diff line
@@ -597,11 +597,11 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) 
	ib->btx_ring [entry].length = (-len) | 0xf000;

	ib->btx_ring [entry].misc = 0;



	skb_copy_from_linear_data(skb, &ib->tx_buf [entry][0], skblen);

	skb_copy_from_linear_data(skb, (void *)&ib->tx_buf [entry][0], skblen);



	/* Clear the slack of the packet, do I need this? */

	if (len != skblen)

		memset ((char *) &ib->tx_buf [entry][skblen], 0, len - skblen);

		memset ((void *) &ib->tx_buf [entry][skblen], 0, len - skblen);



	/* Now, give the packet to the lance */

	ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);

drivers/net/sun3_82586.c

+3 −2
Original line number Diff line number Diff line
@@ -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