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

Commit 5f2e8773 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4d774a7f

drivers/staging/ath6kl/os/linux/ar6000_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, A_UINT32 address, A 
        if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) {

            A_UINT32 param;



            status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(((A_UINT32)fw_entry->data) + board_data_size), board_ext_data_size);

            status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(fw_entry->data + board_data_size), board_ext_data_size);



            if (status != A_OK) {

                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) 
        A_UINT8 csumDest=0;

        A_UINT8 csum=skb->ip_summed;

        if(csumOffload && (csum==CHECKSUM_PARTIAL)){

            csumStart=skb->csum_start-(skb->network_header-skb->head)+sizeof(ATH_LLC_SNAP_HDR);

            csumStart = (skb->head + skb->csum_start - skb_network_header(skb) +

			 sizeof(ATH_LLC_SNAP_HDR));

            csumDest=skb->csum_offset+csumStart;

        }

#endif