hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: fix some compile warnings with kernel 3.14 

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 40734
lede-17.01
Hauke Mehrtens 2014-05-08 21:52:40 +00:00
parent 100e795bcc
commit ff12bcef16
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
View File

@ -33,13 +33,17 @@
if (status < 0) if (status < 0)
--- a/drivers/net/phy/phy.c --- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c
@@ -99,6 +99,9 @@ static int phy_config_interrupt(struct p @@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p
*/ */
static inline int phy_aneg_done(struct phy_device *phydev) static inline int phy_aneg_done(struct phy_device *phydev)
{ {
- int retval = phy_read(phydev, MII_BMSR);
+ int retval;
+
+ if (phydev->drv->aneg_done) + if (phydev->drv->aneg_done)
+ return phydev->drv->aneg_done(phydev); + return phydev->drv->aneg_done(phydev);
+ +
int retval = phy_read(phydev, MII_BMSR); + retval = phy_read(phydev, MII_BMSR);
return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
}

2
target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
View File

@ -6,7 +6,7 @@
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
+ p = of_get_flat_dt_prop(node, "bootargs-append", &l); + p = of_get_flat_dt_prop(node, "bootargs-append", &l);
+ if (p != NULL && l > 0) + if (p != NULL && l > 0)
+ strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE)); + strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
/* /*
* CONFIG_CMDLINE is meant to be a default in case nothing else * CONFIG_CMDLINE is meant to be a default in case nothing else