diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2010-11-07 12:19:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-09 19:49:02 -0500 |
commit | 5f2e87738627d6c0faa50d9f401da0b1571e439c (patch) | |
tree | fbaa8843455055a647261fda4bdabfbd2f143c7c | |
parent | 4d774a7fed886522f55119ef524cbe3c90bbdc38 (diff) |
Staging: ath6kl: Fix pointer casts on 64-bit architectures
Remove unnecessary cast of firmware base address to integer before
adding an offset.
Fix direct use of sk_buff::network_header which is an offset rather
than a pointer on 64-bit architectures.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index c5a6d6c1673..a659f704737 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -1126,7 +1126,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, A_UINT32 address, A | |||
1126 | if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) { | 1126 | if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) { |
1127 | A_UINT32 param; | 1127 | A_UINT32 param; |
1128 | 1128 | ||
1129 | status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(((A_UINT32)fw_entry->data) + board_data_size), board_ext_data_size); | 1129 | status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(fw_entry->data + board_data_size), board_ext_data_size); |
1130 | 1130 | ||
1131 | if (status != A_OK) { | 1131 | if (status != A_OK) { |
1132 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__)); | 1132 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__)); |
@@ -3030,7 +3030,8 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) | |||
3030 | A_UINT8 csumDest=0; | 3030 | A_UINT8 csumDest=0; |
3031 | A_UINT8 csum=skb->ip_summed; | 3031 | A_UINT8 csum=skb->ip_summed; |
3032 | if(csumOffload && (csum==CHECKSUM_PARTIAL)){ | 3032 | if(csumOffload && (csum==CHECKSUM_PARTIAL)){ |
3033 | csumStart=skb->csum_start-(skb->network_header-skb->head)+sizeof(ATH_LLC_SNAP_HDR); | 3033 | csumStart = (skb->head + skb->csum_start - skb_network_header(skb) + |
3034 | sizeof(ATH_LLC_SNAP_HDR)); | ||
3034 | csumDest=skb->csum_offset+csumStart; | 3035 | csumDest=skb->csum_offset+csumStart; |
3035 | } | 3036 | } |
3036 | #endif | 3037 | #endif |