diff options
author | Axel K <rain_maker@root-forum.org> | 2009-09-03 15:13:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:34 -0400 |
commit | 25cf62e43110c43869a58505dae22ad5e2b1416a (patch) | |
tree | 555f0049cf9205a946b80cba4de169916967d30e /drivers | |
parent | a85236c34116621b372c309aa25c2f9bae1b8a15 (diff) |
Staging: rt2860/rt2870/rt3070/rt3090: fix compiler warning on x86_64
When compiling rt2860/rt2870/rt3070 or rt3090 on x86_64, the following warning
is displayed:
drivers/staging/rt3090/rt_linux.c: In function 'duplicate_pkt':
drivers/staging/rt3090/rt_linux.c:531: warning: passing argument 1 of 'memmove' makes pointer from integer without a cast
include2/asm/string_64.h:58: note: expected 'void *' but argument is of type 'sk_buff_data_t'
drivers/staging/rt3090/rt_linux.c:533: warning: passing argument 1 of 'memmove' makes pointer from integer without a cast
include2/asm/string_64.h:58: note: expected 'void *' but argument is of type 'sk_buff_data_t'
The following patch fixes this warning.
Credits go to Helmut Schaa <hschaa@suse.de> for his kind advice/help on this
patch.
Signed-off-by: Axel Koellhofer <rain_maker@root-forum.org>
Cc: Helmut Schaa <hschaa@suse.de>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rt2860/rt_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt3090/rt_linux.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index d7d9b901a014..b396a9b570e2 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c | |||
@@ -537,9 +537,9 @@ PNDIS_PACKET duplicate_pkt( | |||
537 | if ((skb = __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) | 537 | if ((skb = __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) |
538 | { | 538 | { |
539 | skb_reserve(skb, 2); | 539 | skb_reserve(skb, 2); |
540 | NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); | 540 | NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); |
541 | skb_put(skb, HdrLen); | 541 | skb_put(skb, HdrLen); |
542 | NdisMoveMemory(skb->tail, pData, DataSize); | 542 | NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); |
543 | skb_put(skb, DataSize); | 543 | skb_put(skb, DataSize); |
544 | skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); | 544 | skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); |
545 | pPacket = OSPKT_TO_RTPKT(skb); | 545 | pPacket = OSPKT_TO_RTPKT(skb); |
diff --git a/drivers/staging/rt3090/rt_linux.c b/drivers/staging/rt3090/rt_linux.c index 375d0b77cad0..d2241ecdf583 100644 --- a/drivers/staging/rt3090/rt_linux.c +++ b/drivers/staging/rt3090/rt_linux.c | |||
@@ -528,9 +528,9 @@ PNDIS_PACKET duplicate_pkt( | |||
528 | if ((skb = __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) | 528 | if ((skb = __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) |
529 | { | 529 | { |
530 | skb_reserve(skb, 2); | 530 | skb_reserve(skb, 2); |
531 | NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); | 531 | NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); |
532 | skb_put(skb, HdrLen); | 532 | skb_put(skb, HdrLen); |
533 | NdisMoveMemory(skb->tail, pData, DataSize); | 533 | NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); |
534 | skb_put(skb, DataSize); | 534 | skb_put(skb, DataSize); |
535 | skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); | 535 | skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); |
536 | pPacket = OSPKT_TO_RTPKT(skb); | 536 | pPacket = OSPKT_TO_RTPKT(skb); |