aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-03-29 19:16:03 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:28:27 -0700
commit3dbad80ac7632f243b824d469301abb97ec634a1 (patch)
tree321da325189eff0fe04226d09398be727d71b349
parentc45d286e72dd72c0229dc9e2849743ba427fee84 (diff)
downloadkernel_samsung_smdk4412-3dbad80ac7632f243b824d469301abb97ec634a1.zip
kernel_samsung_smdk4412-3dbad80ac7632f243b824d469301abb97ec634a1.tar.gz
kernel_samsung_smdk4412-3dbad80ac7632f243b824d469301abb97ec634a1.tar.bz2
[NET]: Fix warnings in 3c523.c and ni52.c
We have to put back the cast to "char *" because these pointers are volatile. Reported by Andrew Morton. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/3c523.c2
-rw-r--r--drivers/net/ni52.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index a384f7d..da1a22c 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -1145,7 +1145,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)
if (len != skb->len)
memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
- skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len);
+ skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len);
#if (NUM_XMIT_BUFFS == 1)
#ifdef NO_NOPCOMMANDS
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 8646698..8dbd6d1 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -1182,7 +1182,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
else
#endif
{
- skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len);
+ skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len);
len = skb->len;
if (len < ETH_ZLEN) {
len = ETH_ZLEN;