diff options
Diffstat (limited to 'drivers/net/wireless/ath5k/desc.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/desc.c | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath5k/desc.c b/drivers/net/wireless/ath5k/desc.c index dd1374052ba..5e362a7a362 100644 --- a/drivers/net/wireless/ath5k/desc.c +++ b/drivers/net/wireless/ath5k/desc.c @@ -531,10 +531,10 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,  		AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);  	rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,  		AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE); -	rs->rs_antenna = rx_status->rx_status_0 & -		AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA; -	rs->rs_more = rx_status->rx_status_0 & -		AR5K_5210_RX_DESC_STATUS0_MORE; +	rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0, +		AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA); +	rs->rs_more = !!(rx_status->rx_status_0 & +		AR5K_5210_RX_DESC_STATUS0_MORE);  	/* TODO: this timestamp is 13 bit, later on we assume 15 bit */  	rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,  		AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP); @@ -607,10 +607,10 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,  		AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL);  	rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,  		AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE); -	rs->rs_antenna = rx_status->rx_status_0 & -		AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA; -	rs->rs_more = rx_status->rx_status_0 & -		AR5K_5212_RX_DESC_STATUS0_MORE; +	rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0, +		AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA); +	rs->rs_more = !!(rx_status->rx_status_0 & +		AR5K_5212_RX_DESC_STATUS0_MORE);  	rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,  		AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);  	rs->rs_status = 0;  |