diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-17 02:00:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-17 02:00:03 +0000 |
| commit | f1c7fe1507f37bf792f274a9bff61f4c897b1ea6 (patch) | |
| tree | 57dbe6d32b1d701220912c9bb017de256c8e4dbe /target/linux/ar7-2.4/patches | |
| parent | 6cee90e99382167cda56e93bbf417e5970c8bfbd (diff) | |
| download | upstream-f1c7fe1507f37bf792f274a9bff61f4c897b1ea6.tar.gz upstream-f1c7fe1507f37bf792f274a9bff61f4c897b1ea6.tar.bz2 upstream-f1c7fe1507f37bf792f274a9bff61f4c897b1ea6.zip | |
add fix from #763
SVN-Revision: 5179
Diffstat (limited to 'target/linux/ar7-2.4/patches')
| -rw-r--r-- | target/linux/ar7-2.4/patches/003-net_driver_cpmac.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar7-2.4/patches/003-net_driver_cpmac.patch b/target/linux/ar7-2.4/patches/003-net_driver_cpmac.patch index 06df07d29f..3d6d1e5234 100644 --- a/target/linux/ar7-2.4/patches/003-net_driver_cpmac.patch +++ b/target/linux/ar7-2.4/patches/003-net_driver_cpmac.patch @@ -3187,7 +3187,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av + * replace the default MACRO. */ + { + char *mac_port = prom_getenv("MAC_PORT"); /* Internal: 0, External: 1 */ -+ if(0 == strcmp(mac_port, "1")) { ++ if(!mac_port || 0 == strcmp(mac_port, "1")) { + printk("Using the MAC with external PHY\n"); + cfg_start_link_speed = _CPMDIO_NOPHY; + cpmac_max_frame_size = CPMAC_MAX_FRAME_SIZE + 4; @@ -11249,7 +11249,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/dri + } + + //if(phy_sel == auto_detect_cpmac_phy()) -+ if(0 == strcmp(mac_port, "1")) ++ if(!mac_port || 0 == strcmp(mac_port, "1")) + { + printk("Using the MAC with external PHY\n"); + psp_config_add("cpmdio", s3, psp_config_strlen(s3), en_compile); |