-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
This reverts commit 988ddf5.
- Loading branch information
Showing
7 changed files
with
21 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
+MODULE_LICENSE("GPL"); | ||
--- a/kernel/sched/core.c | ||
+++ b/kernel/sched/core.c | ||
@@ -3049,6 +3049,7 @@ int wake_up_state(struct task_struct *p, | ||
@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p, | ||
{ | ||
return try_to_wake_up(p, state, 0); | ||
} | ||
|
37 changes: 0 additions & 37 deletions
37
target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -721,7 +721,7 @@ Signed-off-by: John Crispin <[email protected]> | |
netif_trans_update(dev); | ||
netif_wake_queue(dev); | ||
return; | ||
@@ -618,14 +822,18 @@ static const struct net_device_ops ltq_e | ||
@@ -618,14 +822,19 @@ static const struct net_device_ops ltq_e | ||
.ndo_tx_timeout = ltq_etop_tx_timeout, | ||
}; | ||
|
||
|
@@ -733,6 +733,7 @@ Signed-off-by: John Crispin <[email protected]> | |
struct ltq_etop_priv *priv; | ||
- struct resource *res; | ||
+ struct resource *res, *gbit_res, irqres[2]; | ||
+ const u8 *mac; | ||
int err; | ||
- int i; | ||
+ | ||
|
@@ -744,7 +745,7 @@ Signed-off-by: John Crispin <[email protected]> | |
|
||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
if (!res) { | ||
@@ -651,31 +859,62 @@ ltq_etop_probe(struct platform_device *p | ||
@@ -651,31 +860,64 @@ ltq_etop_probe(struct platform_device *p | ||
goto err_out; | ||
} | ||
|
||
|
@@ -784,7 +785,9 @@ Signed-off-by: John Crispin <[email protected]> | |
+ if (err) | ||
+ pr_err("Can't find phy-mode for port\n"); | ||
+ | ||
+ of_get_mac_address(pdev->dev.of_node, priv->mac); | ||
+ mac = of_get_mac_address(pdev->dev.of_node); | ||
+ if (mac) | ||
+ memcpy(priv->mac, mac, ETH_ALEN); | ||
+ | ||
+ priv->clk_ppe = clk_get(&pdev->dev, NULL); | ||
+ if (IS_ERR(priv->clk_ppe)) | ||
|
@@ -822,7 +825,7 @@ Signed-off-by: John Crispin <[email protected]> | |
|
||
err = register_netdev(dev); | ||
if (err) | ||
@@ -704,31 +943,22 @@ ltq_etop_remove(struct platform_device * | ||
@@ -704,31 +946,22 @@ ltq_etop_remove(struct platform_device * | ||
return 0; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,20 +12,21 @@ Tested-by: Johannes Kimmel <[email protected]> | |
Signed-off-by: Roman Kuzmitskii <[email protected]> | ||
--- a/drivers/staging/octeon/ethernet.c | ||
+++ b/drivers/staging/octeon/ethernet.c | ||
@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres | ||
int cvm_oct_common_init(struct net_device *dev) | ||
@@ -408,9 +408,12 @@ int cvm_oct_common_init(struct net_devic | ||
{ | ||
struct octeon_ethernet *priv = netdev_priv(dev); | ||
const u8 *mac = NULL; | ||
+ const u8 *label = NULL; | ||
int ret; | ||
|
||
+ if (priv->of_node) | ||
- if (priv->of_node) | ||
+ if (priv->of_node) { | ||
mac = of_get_mac_address(priv->of_node); | ||
+ label = of_get_property(priv->of_node, "label", NULL); | ||
+ | ||
ret = of_get_mac_address(priv->of_node, dev->dev_addr); | ||
if (ret) | ||
eth_hw_addr_random(dev); | ||
@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic | ||
+ } | ||
|
||
if (!IS_ERR_OR_NULL(mac)) | ||
ether_addr_copy(dev->dev_addr, mac); | ||
@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic | ||
if (dev->netdev_ops->ndo_stop) | ||
dev->netdev_ops->ndo_stop(dev); | ||
|
||
|