| 1 | From e79bc74f76361020d820ed4611d28f70ebd845ca Mon Sep 17 00:00:00 2001 |
| 2 | From: Jonas Gorski <jonas.gorski@gmail.com> |
| 3 | Date: Tue, 10 Jul 2012 10:44:09 +0200 |
| 4 | Subject: [PATCH 34/84] bcm63xx_enet: don't overwrite settings when setting duplex on force |
| 5 | |
| 6 | --- |
| 7 | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- |
| 8 | 1 files changed, 1 insertions(+), 1 deletions(-) |
| 9 | |
| 10 | --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| 11 | +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| 12 | @@ -2333,7 +2333,7 @@ static int bcm_enetsw_open(struct net_de |
| 13 | } |
| 14 | |
| 15 | if (port->force_duplex_full) |
| 16 | - override = ENETSW_IMPOV_FDX_MASK; |
| 17 | + override |= ENETSW_IMPOV_FDX_MASK; |
| 18 | |
| 19 | |
| 20 | enetsw_writeb(priv, override, ENETSW_PORTOV_REG(i)); |
| 21 | |