diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-10-13 19:28:29 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-10-13 19:28:29 +0000 |
| commit | 6c32d3980c3bc3f0df9640c6343f98e33dc9b283 (patch) | |
| tree | 469e33be326db9db7ae850839fdd4c86d4d36de5 /target/linux/generic/patches-3.10 | |
| parent | 2ffb32dad637b1be72afa767b95c9cadcf0257f4 (diff) | |
| download | master-187ad058-6c32d3980c3bc3f0df9640c6343f98e33dc9b283.tar.gz master-187ad058-6c32d3980c3bc3f0df9640c6343f98e33dc9b283.tar.bz2 master-187ad058-6c32d3980c3bc3f0df9640c6343f98e33dc9b283.zip | |
kernel: update kernel to 3.10.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38384 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10')
| -rw-r--r-- | target/linux/generic/patches-3.10/770-bgmac-backport.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/target/linux/generic/patches-3.10/770-bgmac-backport.patch b/target/linux/generic/patches-3.10/770-bgmac-backport.patch index 3651be70cd..99415a6d75 100644 --- a/target/linux/generic/patches-3.10/770-bgmac-backport.patch +++ b/target/linux/generic/patches-3.10/770-bgmac-backport.patch @@ -163,13 +163,11 @@ patches for bgmac backported from net-next/master ring->num_slots * sizeof(struct bgmac_dma_desc)); ring->start = 0; -@@ -908,10 +934,10 @@ static void bgmac_chip_reset(struct bgma - struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc; +@@ -909,9 +935,9 @@ static void bgmac_chip_reset(struct bgma u8 et_swtype = 0; u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY | -- BGMAC_CHIPCTL_1_IF_TYPE_RMII; + BGMAC_CHIPCTL_1_IF_TYPE_MII; - char buf[2]; -+ BGMAC_CHIPCTL_1_IF_TYPE_MII; + char buf[4]; - if (bcm47xx_nvram_getenv("et_swtype", buf, 1) > 0) { @@ -188,15 +186,6 @@ patches for bgmac backported from net-next/master --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -333,7 +333,7 @@ - - #define BGMAC_CHIPCTL_1_IF_TYPE_MASK 0x00000030 - #define BGMAC_CHIPCTL_1_IF_TYPE_RMII 0x00000000 --#define BGMAC_CHIPCTL_1_IF_TYPE_MI 0x00000010 -+#define BGMAC_CHIPCTL_1_IF_TYPE_MII 0x00000010 - #define BGMAC_CHIPCTL_1_IF_TYPE_RGMII 0x00000020 - #define BGMAC_CHIPCTL_1_SW_TYPE_MASK 0x000000C0 - #define BGMAC_CHIPCTL_1_SW_TYPE_EPHY 0x00000000 @@ -384,6 +384,8 @@ struct bgmac_dma_ring { u16 mmio_base; struct bgmac_dma_desc *cpu_base; |