diff --git a/[refs] b/[refs] index f095059a348b..48e119a1c936 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c +refs/heads/master: 58dbc691e6ca6689402424db60f4a54745a38c67 diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c index f4dddceecb04..4665a3932b98 100644 --- a/trunk/drivers/net/ethernet/rdc/r6040.c +++ b/trunk/drivers/net/ethernet/rdc/r6040.c @@ -371,7 +371,7 @@ static void r6040_init_mac_regs(struct net_device *dev) iowrite16(MAC_RST, ioaddr + MCR1); while (limit--) { cmd = ioread16(ioaddr + MCR1); - if (cmd & 0x1) + if (cmd & MAC_RST) break; } /* Reset internal state machine */ @@ -453,7 +453,7 @@ static void r6040_down(struct net_device *dev) iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */ while (limit--) { cmd = ioread16(ioaddr + MCR1); - if (cmd & 0x1) + if (cmd & MAC_RST) break; } @@ -735,7 +735,7 @@ static void r6040_mac_address(struct net_device *dev) u16 *adrp; /* MAC operation register */ - iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ + iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */ iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(0, ioaddr + MAC_SM); mdelay(5);