Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'r6040-cleanups'
Florian Fainelli says:
====================
net: r6040: Non-functional changes
These two patches clean up the r6040 driver a little bit in preparation
for adding additional features such as dumping MAC counters and properly
dealing with DMA-API mapping.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
+4
-4
+4
-4
drivers/net/ethernet/rdc/r6040.c
+4
-4
drivers/net/ethernet/rdc/r6040.c
···
200
200
int limit = MAC_DEF_TIMEOUT;
201
201
u16 cmd;
202
202
203
-
iowrite16(MDIO_READ + reg + (phy_addr << 8), ioaddr + MMDIO);
203
+
iowrite16(MDIO_READ | reg | (phy_addr << 8), ioaddr + MMDIO);
204
204
/* Wait for the read bit to be cleared */
205
205
while (limit--) {
206
206
cmd = ioread16(ioaddr + MMDIO);
···
224
224
225
225
iowrite16(val, ioaddr + MMWD);
226
226
/* Write the command to the MDIO bus */
227
-
iowrite16(MDIO_WRITE + reg + (phy_addr << 8), ioaddr + MMDIO);
227
+
iowrite16(MDIO_WRITE | reg | (phy_addr << 8), ioaddr + MMDIO);
228
228
/* Wait for the write bit to be cleared */
229
229
while (limit--) {
230
230
cmd = ioread16(ioaddr + MMDIO);
···
544
544
skb_ptr->dev = priv->dev;
545
545
546
546
/* Do not count the CRC */
547
-
skb_put(skb_ptr, descptr->len - 4);
547
+
skb_put(skb_ptr, descptr->len - ETH_FCS_LEN);
548
548
dma_unmap_single(&priv->pdev->dev, le32_to_cpu(descptr->buf),
549
549
MAX_BUF_SIZE, DMA_FROM_DEVICE);
550
550
skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev);
···
552
552
/* Send to upper layer */
553
553
netif_receive_skb(skb_ptr);
554
554
dev->stats.rx_packets++;
555
-
dev->stats.rx_bytes += descptr->len - 4;
555
+
dev->stats.rx_bytes += descptr->len - ETH_FCS_LEN;
556
556
557
557
/* put new skb into descriptor */
558
558
descptr->skb_ptr = new_skb;