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

Commit b9d2dde0 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: et131x: Correct WRAP bit handling 



add_10bit loses the existing wrap value

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4439c935

drivers/staging/et131x/et1310_rx.c

+14 −6
Original line number Diff line number Diff line
@@ -1178,9 +1178,17 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) 
static inline u32 bump_fbr(u32 *fbr, u32 limit)

{

        u32 v = *fbr;

	add_10bit(&v, 1);

	if (v > limit)

		v = (*fbr & ~ET_DMA10_MASK) ^ ET_DMA10_WRAP;

        v++;

        /* This works for all cases where limit < 1024. The 1023 case

           works because 1023++ is 1024 which means the if condition is not

           taken but the carry of the bit into the wrap bit toggles the wrap

           value correctly */

        if ((v & ET_DMA10_MASK) > limit) {

                v &= ~ET_DMA10_MASK;

                v ^= ET_DMA10_WRAP;

        }

        /* For the 1023 case */

        v &= (ET_DMA10_MASK|ET_DMA10_WRAP);

        *fbr = v;

        return v;

}