From 47f28a17c3cec43740d0445f3b7048e399b5c69f Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 15:41:52 +0200 Subject: [GCC4] fix warnings in drivers/net/de4x5,depca,arcnet This patch fixes this warning with gcc 4 : de4x5.c: In function 'mii_get_phy': de4x5.c:5112: warning: operation on 'i' may be undefined depca.c: In function 'load_packet': depca.c:1749: warning: operation on 'i' may be undefined arcnet.c: In function 'release_arcbuf': arcnet.c:280: warning: operation on 'i' may be undefined arcnet.c: In function 'get_arcbuf': arcnet.c:313: warning: operation on 'i' may be undefined --- drivers/net/arcnet/arcnet.c | 4 ++-- drivers/net/de4x5.c | 2 +- drivers/net/depca.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index 77687bb..ae79284 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c @@ -277,7 +277,7 @@ static void release_arcbuf(struct net_de BUGLVL(D_DURING) { BUGMSG(D_DURING, "release_arcbuf: freed #%d; buffer queue is now: ", bufnum); - for (i = lp->next_buf; i != lp->first_free_buf; i = ++i % 5) + for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5) BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]); BUGMSG2(D_DURING, "\n"); } @@ -310,7 +310,7 @@ static int get_arcbuf(struct net_device BUGLVL(D_DURING) { BUGMSG(D_DURING, "get_arcbuf: got #%d; buffer queue is now: ", buf); - for (i = lp->next_buf; i != lp->first_free_buf; i = ++i % 5) + for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5) BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]); BUGMSG2(D_DURING, "\n"); } diff --git a/drivers/net/de4x5.c b/drivers/net/de4x5.c index 955fc66..d119720 100644 --- a/drivers/net/de4x5.c +++ b/drivers/net/de4x5.c @@ -5109,7 +5109,7 @@ mii_get_phy(struct net_device *dev) lp->useMII = TRUE; /* Search the MII address space for possible PHY devices */ - for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(++i)%DE4X5_MAX_MII) { + for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(i+1)%DE4X5_MAX_MII) { lp->phy[lp->active].addr = i; if (i==0) n++; /* Count cycles */ while (de4x5_reset_phy(dev)<0) udelay(100);/* Wait for reset */ diff --git a/drivers/net/depca.c b/drivers/net/depca.c index 3479e73..3b981d5 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c @@ -1746,7 +1746,7 @@ static int load_packet(struct net_device /* set up the buffer descriptors */ len = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len; - for (i = entry; i != end; i = (++i) & lp->txRingMask) { + for (i = entry; i != end; i = (i+1) & lp->txRingMask) { /* clean out flags */ writel(readl(&lp->tx_ring[i].base) & ~T_FLAGS, &lp->tx_ring[i].base); writew(0x0000, &lp->tx_ring[i].misc); /* clears other error flags */ -- 1.4.2