| Message ID | 1325949197-10143-1-git-send-email-cesarb@cesarb.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Cesar Eduardo Barros <cesarb@cesarb.net> Date: Sat, 7 Jan 2012 13:13:17 -0200 > Commit 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c (r6040: define more MCR0 > register bits) added #define values for MCR0 register bits and converted > uses of hardcoded magic values to uses of these defines. > > However, one of the conversions looks suspicious: > > #define MCR0 0x00 /* Control register 0 */ > +#define MCR0_RCVEN 0x0002 /* Receive enable */ > +#define MCR0_XMTEN 0x1000 /* Transmission enable */ > > /* Init RDC private data */ > - lp->mcr0 = 0x1002; > + lp->mcr0 = MCR0_XMTEN | MCR0; > > I believe what was meant here was MCR0_XMTEN | MCR0_RCVEN, which makes > sense and matches the original values. > > Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Good catch, applied, thanks a lot. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/07/12 21:09, David Miller wrote: > From: Cesar Eduardo Barros<cesarb@cesarb.net> > Date: Sat, 7 Jan 2012 13:13:17 -0200 > >> Commit 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c (r6040: define more MCR0 >> register bits) added #define values for MCR0 register bits and converted >> uses of hardcoded magic values to uses of these defines. >> >> However, one of the conversions looks suspicious: >> >> #define MCR0 0x00 /* Control register 0 */ >> +#define MCR0_RCVEN 0x0002 /* Receive enable */ >> +#define MCR0_XMTEN 0x1000 /* Transmission enable */ >> >> /* Init RDC private data */ >> - lp->mcr0 = 0x1002; >> + lp->mcr0 = MCR0_XMTEN | MCR0; >> >> I believe what was meant here was MCR0_XMTEN | MCR0_RCVEN, which makes >> sense and matches the original values. >> >> Signed-off-by: Cesar Eduardo Barros<cesarb@cesarb.net> > Good catch, applied, thanks a lot. Indeed, thanks Cesar. -- Florian -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index 87aa439..cb0eca8 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, lp->dev = dev; /* Init RDC private data */ - lp->mcr0 = MCR0_XMTEN | MCR0; + lp->mcr0 = MCR0_XMTEN | MCR0_RCVEN; /* The RDC-specific entries in the device structure. */ dev->netdev_ops = &r6040_netdev_ops;
Commit 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c (r6040: define more MCR0 register bits) added #define values for MCR0 register bits and converted uses of hardcoded magic values to uses of these defines. However, one of the conversions looks suspicious: #define MCR0 0x00 /* Control register 0 */ +#define MCR0_RCVEN 0x0002 /* Receive enable */ +#define MCR0_XMTEN 0x1000 /* Transmission enable */ /* Init RDC private data */ - lp->mcr0 = 0x1002; + lp->mcr0 = MCR0_XMTEN | MCR0; I believe what was meant here was MCR0_XMTEN | MCR0_RCVEN, which makes sense and matches the original values. Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> --- drivers/net/ethernet/rdc/r6040.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)