diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 05:28:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 05:28:59 +0100 |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /drivers/net/wireless/airo.c | |
| parent | net,socket: introduce DECLARE_SOCKADDR helper to catch overflow at build time (diff) | |
| parent | net: Fix 'Re: PACKET_TX_RING: packet size is too long' (diff) | |
| download | linux-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.tar.xz linux-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index e265ba14054b..4eec87c3be2b 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -4790,9 +4790,8 @@ static int proc_stats_rid_open( struct inode *inode, static int get_dec_u16( char *buffer, int *start, int limit ) { u16 value; int valid = 0; - for( value = 0; buffer[*start] >= '0' && - buffer[*start] <= '9' && - *start < limit; (*start)++ ) { + for (value = 0; *start < limit && buffer[*start] >= '0' && + buffer[*start] <= '9'; (*start)++) { valid = 1; value *= 10; value += buffer[*start] - '0'; |