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

net/de4x5: remove undefined operations

Browse source 
Modifying an object twice without an intervening sequence point is
undefined.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andreas Schwab 2010-09-11 01:08:58 +00:00 committed by David S. Miller
parent 61a21455ee
commit 1570475a47
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/tulip/de4x5.c
View file

@ -1448,7 +1448,7 @@ de4x5_sw_reset(struct net_device *dev)
status = -EIO; status = -EIO;
} }
lp->tx_new = (++lp->tx_new) % lp->txRingSize; lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
lp->tx_old = lp->tx_new; lp->tx_old = lp->tx_new;
return status; return status;
@ -1506,7 +1506,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
lp->stats.tx_bytes += skb->len; lp->stats.tx_bytes += skb->len;
outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */ outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */
lp->tx_new = (++lp->tx_new) % lp->txRingSize; lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
if (TX_BUFFS_AVAIL) { if (TX_BUFFS_AVAIL) {
netif_start_queue(dev); /* Another pkt may be queued */ netif_start_queue(dev); /* Another pkt may be queued */
@ -1657,7 +1657,7 @@ de4x5_rx(struct net_device *dev)
} }
/* Change buffer ownership for this frame, back to the adapter */ /* Change buffer ownership for this frame, back to the adapter */
for (;lp->rx_old!=entry;lp->rx_old=(++lp->rx_old)%lp->rxRingSize) { for (;lp->rx_old!=entry;lp->rx_old=(lp->rx_old + 1)%lp->rxRingSize) {
lp->rx_ring[lp->rx_old].status = cpu_to_le32(R_OWN); lp->rx_ring[lp->rx_old].status = cpu_to_le32(R_OWN);
barrier(); barrier();
} }
@ -1668,7 +1668,7 @@ de4x5_rx(struct net_device *dev)
/* /*
** Update entry information ** Update entry information
*/ */
lp->rx_new = (++lp->rx_new) % lp->rxRingSize; lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
} }
return 0; return 0;
@ -1726,7 +1726,7 @@ de4x5_tx(struct net_device *dev)
} }
/* Update all the pointers */ /* Update all the pointers */
lp->tx_old = (++lp->tx_old) % lp->txRingSize; lp->tx_old = (lp->tx_old + 1) % lp->txRingSize;
} }
/* Any resources available? */ /* Any resources available? */
@ -1801,7 +1801,7 @@ de4x5_rx_ovfc(struct net_device *dev)
for (; (s32)le32_to_cpu(lp->rx_ring[lp->rx_new].status)>=0;) { for (; (s32)le32_to_cpu(lp->rx_ring[lp->rx_new].status)>=0;) {
lp->rx_ring[lp->rx_new].status = cpu_to_le32(R_OWN); lp->rx_ring[lp->rx_new].status = cpu_to_le32(R_OWN);
lp->rx_new = (++lp->rx_new % lp->rxRingSize); lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
} }
outl(omr, DE4X5_OMR); outl(omr, DE4X5_OMR);
@ -1932,7 +1932,7 @@ set_multicast_list(struct net_device *dev)
load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET | load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
SETUP_FRAME_LEN, (struct sk_buff *)1); SETUP_FRAME_LEN, (struct sk_buff *)1);
lp->tx_new = (++lp->tx_new) % lp->txRingSize; lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
outl(POLL_DEMAND, DE4X5_TPD); /* Start the TX */ outl(POLL_DEMAND, DE4X5_TPD); /* Start the TX */
dev->trans_start = jiffies; /* prevent tx timeout */ dev->trans_start = jiffies; /* prevent tx timeout */
} }
@ -3568,7 +3568,7 @@ ping_media(struct net_device *dev, int msec)
lp->tmp = lp->tx_new; /* Remember the ring position */ lp->tmp = lp->tx_new; /* Remember the ring position */
load_packet(dev, lp->frame, TD_LS | TD_FS | sizeof(lp->frame), (struct sk_buff *)1); load_packet(dev, lp->frame, TD_LS | TD_FS | sizeof(lp->frame), (struct sk_buff *)1);
lp->tx_new = (++lp->tx_new) % lp->txRingSize; lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
outl(POLL_DEMAND, DE4X5_TPD); outl(POLL_DEMAND, DE4X5_TPD);
} }
@ -5417,7 +5417,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
/* Set up the descriptor and give ownership to the card */ /* Set up the descriptor and give ownership to the card */
load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET | load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
SETUP_FRAME_LEN, (struct sk_buff *)1); SETUP_FRAME_LEN, (struct sk_buff *)1);
lp->tx_new = (++lp->tx_new) % lp->txRingSize; lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
outl(POLL_DEMAND, DE4X5_TPD); /* Start the TX */ outl(POLL_DEMAND, DE4X5_TPD); /* Start the TX */
netif_wake_queue(dev); /* Unlock the TX ring */ netif_wake_queue(dev); /* Unlock the TX ring */
break; break;