diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 19:17:07 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 19:17:07 +0000 |
| commit | 44b51440ce610cb6166bccab7ab066c1fff33a19 (patch) | |
| tree | e12b3529e8e3dab8e97c52f732a894693c0b48ed /target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch | |
| parent | 4bc51e20f21baaee23731f804b35d65937c6e19f (diff) | |
| download | upstream-44b51440ce610cb6166bccab7ab066c1fff33a19.tar.gz upstream-44b51440ce610cb6166bccab7ab066c1fff33a19.tar.bz2 upstream-44b51440ce610cb6166bccab7ab066c1fff33a19.zip | |
cleanup trailing whitespaces in 2.6.26 patches
SVN-Revision: 11945
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch index ec0a402b66..39f22bbdef 100644 --- a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch +++ b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch @@ -20,7 +20,7 @@ + if (copy_to_user(useraddr, &ecmd, sizeof(ecmd))) + return -EFAULT; + return 0; -+ ++ + case ETHTOOL_SSET: + if (copy_from_user(&ecmd, useraddr, sizeof(ecmd))) + return -EFAULT; @@ -33,7 +33,7 @@ + tmp |= (BMCR_ANRESTART); + phy_write(phydev, MII_BMCR, tmp); + return 0; -+ } ++ } + return -EINVAL; + + case ETHTOOL_GLINK: @@ -51,6 +51,26 @@ /** * phy_mii_ioctl - generic PHY MII ioctl interface * @phydev: the phy_device struct +@@ -403,8 +447,8 @@ + } + + phy_write(phydev, mii_data->reg_num, val); +- +- if (mii_data->reg_num == MII_BMCR ++ ++ if (mii_data->reg_num == MII_BMCR + && val & BMCR_RESET + && phydev->drv->config_init) { + phy_scan_fixups(phydev); +@@ -524,7 +568,7 @@ + int idx; + + idx = phy_find_setting(phydev->speed, phydev->duplex); +- ++ + idx++; + + idx = phy_find_valid(idx, phydev->supported); --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -434,6 +434,7 @@ |