Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Simon Horman <horms@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
horms@vergenet.net 2010-01-08 18:57:52 +11:00 committed by Greg Kroah-Hartman
parent 3db96cd871
commit e36e8c0add
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/otus/80211core/cagg.c
View file

@ -1838,7 +1838,6 @@ struct agg_tid_rx* zfAggRxEnabled(zdev_t* dev, zbuf_t* buf)
u16_t frameType; u16_t frameType;
u16_t frameCtrl; u16_t frameCtrl;
u16_t frameSubtype; u16_t frameSubtype;
u32_t tcp_seq;
//struct aggSta *agg_sta; //struct aggSta *agg_sta;
#if ZM_AGG_FPGA_REORDERING #if ZM_AGG_FPGA_REORDERING
struct agg_tid_rx *tid_rx; struct agg_tid_rx *tid_rx;
@ -1863,13 +1862,17 @@ struct agg_tid_rx* zfAggRxEnabled(zdev_t* dev, zbuf_t* buf)
return NULL; return NULL;
} }
#ifdef ZM_ENABLE_PERFORMANCE_EVALUATION #ifdef ZM_ENABLE_PERFORMANCE_EVALUATION
tcp_seq = zmw_rx_buf_readb(dev, buf, 22+36) << 24; {
tcp_seq += zmw_rx_buf_readb(dev, buf, 22+37) << 16; u32_t tcp_seq;
tcp_seq += zmw_rx_buf_readb(dev, buf, 22+38) << 8;
tcp_seq += zmw_rx_buf_readb(dev, buf, 22+39); 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 #endif
ZM_SEQ_DEBUG("In %5d, %12u\n", seq_no, tcp_seq);
dst0 = zmw_rx_buf_readh(dev, buf, offset+4); dst0 = zmw_rx_buf_readh(dev, buf, offset+4);
src[0] = zmw_rx_buf_readh(dev, buf, offset+10); src[0] = zmw_rx_buf_readh(dev, buf, offset+10);

1
drivers/staging/otus/80211core/pub_zfi.h
View file

@ -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_AMSDU(dev, buf, len)
#define ZM_PERFORMANCE_RX_FLUSH(dev) #define ZM_PERFORMANCE_RX_FLUSH(dev)
#define ZM_PERFORMANCE_RX_CLEAR(dev) #define ZM_PERFORMANCE_RX_CLEAR(dev)
#define ZM_SEQ_DEBUG
#define ZM_PERFORMANCE_RX_REORDER(dev) #define ZM_PERFORMANCE_RX_REORDER(dev)
#endif #endif
/***** End of section 3 *****/ /***** End of section 3 *****/