projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.120
[openwrt/staging/chunkeey.git]
/
target
/
linux
/
layerscape
/
patches-4.14
/
202-core-linux-support-layerscape.patch
diff --git
a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
index b60b20049ab95aad2d3405ca9800dff7d1a3826f..a5b51a7cfb1b1cc36f3359adba31adf3b848ac91 100644
(file)
--- a/
target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
+++ b/
target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
@@
-95,7
+95,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
case SIOCBONDRELEASE:
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
case SIOCBONDRELEASE:
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
-@@ -138
9,7 +1389
,7 @@ static int bond_option_slaves_set(struct
+@@ -138
2,7 +1382
,7 @@ static int bond_option_slaves_set(struct
switch (command[0]) {
case '+':
netdev_dbg(bond->dev, "Adding slave %s\n", dev->name);
switch (command[0]) {
case '+':
netdev_dbg(bond->dev, "Adding slave %s\n", dev->name);
@@
-358,7
+358,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
}
#ifdef CONFIG_NET_INGRESS
}
#ifdef CONFIG_NET_INGRESS
-@@ -63
38,7 +6339
,15 @@ static int __netdev_upper_dev_link(struc
+@@ -63
41,7 +6342
,15 @@ static int __netdev_upper_dev_link(struc
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info)
{
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info)
{
@@
-375,7
+375,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
int ret = 0;
ASSERT_RTNL();
int ret = 0;
ASSERT_RTNL();
-@@ -635
6,12 +6365
,7 @@ static int __netdev_upper_dev_link(struc
+@@ -635
9,12 +6368
,7 @@ static int __netdev_upper_dev_link(struc
if (master && netdev_master_upper_dev_get(dev))
return -EBUSY;
if (master && netdev_master_upper_dev_get(dev))
return -EBUSY;
@@
-389,7
+389,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
&changeupper_info.info);
ret = notifier_to_errno(ret);
if (ret)
&changeupper_info.info);
ret = notifier_to_errno(ret);
if (ret)
-@@ -637
3,7 +6377
,7 @@ static int __netdev_upper_dev_link(struc
+@@ -637
6,7 +6380
,7 @@ static int __netdev_upper_dev_link(struc
return ret;
netdev_update_addr_mask(dev);
return ret;
netdev_update_addr_mask(dev);
@@
-398,7
+398,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
&changeupper_info.info);
ret = notifier_to_errno(ret);
if (ret)
&changeupper_info.info);
ret = notifier_to_errno(ret);
if (ret)
-@@ -64
37,21 +6441
,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li
+@@ -64
40,21 +6444
,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li
void netdev_upper_dev_unlink(struct net_device *dev,
struct net_device *upper_dev)
{
void netdev_upper_dev_unlink(struct net_device *dev,
struct net_device *upper_dev)
{
@@
-429,7
+429,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
&changeupper_info.info);
}
EXPORT_SYMBOL(netdev_upper_dev_unlink);
&changeupper_info.info);
}
EXPORT_SYMBOL(netdev_upper_dev_unlink);
-@@ -64
67,11 +6475
,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);
+@@ -64
70,11 +6478
,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);
void netdev_bonding_info_change(struct net_device *dev,
struct netdev_bonding_info *bonding_info)
{
void netdev_bonding_info_change(struct net_device *dev,
struct netdev_bonding_info *bonding_info)
{
@@
-445,7
+445,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
&info.info);
}
EXPORT_SYMBOL(netdev_bonding_info_change);
&info.info);
}
EXPORT_SYMBOL(netdev_bonding_info_change);
-@@ -6
597,11 +6607
,13 @@ EXPORT_SYMBOL(dev_get_nest_level);
+@@ -6
600,11 +6610
,13 @@ EXPORT_SYMBOL(dev_get_nest_level);
void netdev_lower_state_changed(struct net_device *lower_dev,
void *lower_state_info)
{
void netdev_lower_state_changed(struct net_device *lower_dev,
void *lower_state_info)
{
@@
-461,7
+461,7
@@
Signed-off-by: Biwen Li <biwen.li@nxp.com>
&changelowerstate_info.info);
}
EXPORT_SYMBOL(netdev_lower_state_changed);
&changelowerstate_info.info);
}
EXPORT_SYMBOL(netdev_lower_state_changed);
-@@ -689
2,11 +6904
,14 @@ void __dev_notify_flags(struct net_devic
+@@ -689
5,11 +6907
,14 @@ void __dev_notify_flags(struct net_devic
if (dev->flags & IFF_UP &&
(changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) {
if (dev->flags & IFF_UP &&
(changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) {