Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[drivers] Fix warnings identified by gcc 4.5
In building gpxe for openSUSE Factory (part of kvm package), there were
a few problems identified by the compiler.  This patch addresses them.

Signed-off-by: Bruce Rogers <brogers@novell.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
  • Loading branch information
Bruce Rogers authored and Marty Connor committed Apr 16, 2010
1 parent 46d6ec7 commit f7c5918
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/drivers/net/ath5k/ath5k_qcu.c
Expand Up @@ -268,7 +268,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah)
}

if (tq->tqi_ready_time &&
(tq->tqi_type != AR5K_TX_QUEUE_ID_CAB))
(tq->tqi_type != AR5K_TX_QUEUE_CAB))
ath5k_hw_reg_write(ah, AR5K_REG_SM(tq->tqi_ready_time,
AR5K_QCU_RDYTIMECFG_INTVAL) |
AR5K_QCU_RDYTIMECFG_ENABLE,
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/net/ns83820.c
Expand Up @@ -687,7 +687,7 @@ static int ns83820_poll(struct nic *nic, int retrieve)
// rx_ring[entry].link = 0;
rx_ring[entry].cmdsts = cpu_to_le32(CMDSTS_OWN);

ns->cur_rx = ++ns->cur_rx % NR_RX_DESC;
ns->cur_rx = (ns->cur_rx + 1) % NR_RX_DESC;

if (ns->cur_rx == 0) /* We have wrapped the ring */
kick_rx();
Expand Down
4 changes: 2 additions & 2 deletions src/drivers/net/tulip.c
Expand Up @@ -1171,7 +1171,7 @@ static int tulip_poll(struct nic *nic, int retrieve)
if (rx_ring[tp->cur_rx].status & 0x00008000) {
/* return the descriptor and buffer to receive ring */
rx_ring[tp->cur_rx].status = 0x80000000;
tp->cur_rx = (++tp->cur_rx) % RX_RING_SIZE;
tp->cur_rx = (tp->cur_rx + 1) % RX_RING_SIZE;
return 0;
}

Expand All @@ -1180,7 +1180,7 @@ static int tulip_poll(struct nic *nic, int retrieve)

/* return the descriptor and buffer to receive ring */
rx_ring[tp->cur_rx].status = 0x80000000;
tp->cur_rx = (++tp->cur_rx) % RX_RING_SIZE;
tp->cur_rx = (tp->cur_rx + 1) % RX_RING_SIZE;

return 1;
}
Expand Down

0 comments on commit f7c5918

Please sign in to comment.