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

Commit e36e8c0a authored by horms@vergenet.net's avatar horms@vergenet.net Committed by Greg Kroah-Hartman
Browse files

Staging: otus: Fix ZM_SEQ_DEBUG macro for no-debug case 



tcp_seq is only initialised in case where ZM_ENABLE_PERFORMANCE_EVALUATION
is defined. So move the call to ZM_SEQ_DEBUG() and the decleration of
tcp_seq in there too.  This allows ZM_SEQ_DEBUG() to be removed from the
non-ZM_ENABLE_PERFORMANCE_EVALUATION case in the header file.

This resolves several compile warnings for the
non-ZM_ENABLE_PERFORMANCE_EVALUATION case.
However, the ZM_ENABLE_PERFORMANCE_EVALUATION
case seems to be completely broken.

$ gcc (Debian 4.4.2-8) 4.4.2
Copyright (C) 2009 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

$ make
...
drivers/staging/otus/80211core/cagg.c: In function 'zfAggRxEnabled':
drivers/staging/otus/80211core/cagg.c:1872: warning: left-hand operand of
comma expression has no effect
drivers/staging/otus/80211core/cagg.c:1872: warning: left-hand operand of
comma expression has no effect
drivers/staging/otus/80211core/cagg.c:1872: warning: statement with no
effect
...

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3db96cd8

drivers/staging/otus/80211core/cagg.c

+9 −6
Original line number Diff line number Diff line
@@ -1838,7 +1838,6 @@ struct agg_tid_rx* zfAggRxEnabled(zdev_t* dev, zbuf_t* buf) 
    u16_t frameType;

    u16_t frameCtrl;

    u16_t frameSubtype;

    u32_t tcp_seq;

    //struct aggSta *agg_sta;

#if ZM_AGG_FPGA_REORDERING

    struct agg_tid_rx *tid_rx;
@@ -1863,13 +1862,17 @@ struct agg_tid_rx* zfAggRxEnabled(zdev_t* dev, zbuf_t* buf) 
        return NULL;

    }

#ifdef ZM_ENABLE_PERFORMANCE_EVALUATION

    {

        u32_t tcp_seq;



        tcp_seq = zmw_rx_buf_readb(dev, buf, 22+36) << 24;

        tcp_seq += zmw_rx_buf_readb(dev, buf, 22+37) << 16;

        tcp_seq += zmw_rx_buf_readb(dev, buf, 22+38) << 8;

        tcp_seq += zmw_rx_buf_readb(dev, buf, 22+39);

        ZM_SEQ_DEBUG("In                   %5d, %12u\n", seq_no, tcp_seq);

    }

#endif



    ZM_SEQ_DEBUG("In                   %5d, %12u\n", seq_no, tcp_seq);

    dst0 = zmw_rx_buf_readh(dev, buf, offset+4);



    src[0] = zmw_rx_buf_readh(dev, buf, offset+10);

drivers/staging/otus/80211core/pub_zfi.h

+0 −1
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ extern void zfiRxPerformanceReg(zdev_t* dev, u32_t reg, u32_t rsp); 
#define ZM_PERFORMANCE_RX_AMSDU(dev, buf, len)

#define ZM_PERFORMANCE_RX_FLUSH(dev)

#define ZM_PERFORMANCE_RX_CLEAR(dev)

#define ZM_SEQ_DEBUG

#define ZM_PERFORMANCE_RX_REORDER(dev)

#endif

/***** End of section 3 *****/