diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
| commit | 33d52fa247dea4d517652a875a0900563d210f10 (patch) | |
| tree | 9fde69e62a7f7eb03a0ea5f94db8ccaa77f02613 /target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch | |
| parent | 4d69d9733e24b3210eed0db7f41d407d3e3103ed (diff) | |
| download | upstream-33d52fa247dea4d517652a875a0900563d210f10.tar.gz upstream-33d52fa247dea4d517652a875a0900563d210f10.tar.bz2 upstream-33d52fa247dea4d517652a875a0900563d210f10.zip | |
[brcm63xx] add preliminary support for 3.6 kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33936 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch b/target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch new file mode 100644 index 0000000000..407c8169ec --- /dev/null +++ b/target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch @@ -0,0 +1,20 @@ +From e79bc74f76361020d820ed4611d28f70ebd845ca Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jonas.gorski@gmail.com> +Date: Tue, 10 Jul 2012 10:44:09 +0200 +Subject: [PATCH 34/84] bcm63xx_enet: don't overwrite settings when setting duplex on force + +--- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c ++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +@@ -2333,7 +2333,7 @@ static int bcm_enetsw_open(struct net_de + } + + if (port->force_duplex_full) +- override = ENETSW_IMPOV_FDX_MASK; ++ override |= ENETSW_IMPOV_FDX_MASK; + + + enetsw_writeb(priv, override, ENETSW_PORTOV_REG(i)); |