diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-03-29 22:16:03 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:28:27 -0400 |
commit | 3dbad80ac7632f243b824d469301abb97ec634a1 (patch) | |
tree | 321da325189eff0fe04226d09398be727d71b349 | |
parent | c45d286e72dd72c0229dc9e2849743ba427fee84 (diff) |
[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.c | 2 | ||||
-rw-r--r-- | drivers/net/ni52.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index a384f7d478ab..da1a22c13865 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) | |||
1145 | 1145 | ||
1146 | if (len != skb->len) | 1146 | if (len != skb->len) |
1147 | memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN); | 1147 | memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN); |
1148 | skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len); | 1148 | skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len); |
1149 | 1149 | ||
1150 | #if (NUM_XMIT_BUFFS == 1) | 1150 | #if (NUM_XMIT_BUFFS == 1) |
1151 | #ifdef NO_NOPCOMMANDS | 1151 | #ifdef NO_NOPCOMMANDS |
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index 8646698c77d4..8dbd6d1900b5 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) | |||
1182 | else | 1182 | else |
1183 | #endif | 1183 | #endif |
1184 | { | 1184 | { |
1185 | skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len); | 1185 | skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len); |
1186 | len = skb->len; | 1186 | len = skb->len; |
1187 | if (len < ETH_ZLEN) { | 1187 | if (len < ETH_ZLEN) { |
1188 | len = ETH_ZLEN; | 1188 | len = ETH_ZLEN; |