projects
/
openwrt
/
staging
/
jow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update and refresh patches
[openwrt/staging/jow.git]
/
target
/
linux
/
mvebu
/
patches-4.9
/
419-net-mvneta-convert-to-phylink.patch
diff --git
a/target/linux/mvebu/patches-4.9/419-net-mvneta-convert-to-phylink.patch
b/target/linux/mvebu/patches-4.9/419-net-mvneta-convert-to-phylink.patch
index dca4fa2992e7058e843fccdac6e9efda0c326823..bc8d5fdacfd4020c7f0cf52ed8cb2ac7c3df49dc 100644
(file)
--- a/
target/linux/mvebu/patches-4.9/419-net-mvneta-convert-to-phylink.patch
+++ b/
target/linux/mvebu/patches-4.9/419-net-mvneta-convert-to-phylink.patch
@@
-182,7
+182,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Release Tx descriptors */
}
/* Release Tx descriptors */
-@@ -298
2,7 +2929
,6 @@ static int mvneta_setup_txqs(struct mvne
+@@ -298
0,7 +2927
,6 @@ static int mvneta_setup_txqs(struct mvne
static void mvneta_start_dev(struct mvneta_port *pp)
{
int cpu;
static void mvneta_start_dev(struct mvneta_port *pp)
{
int cpu;
@@
-190,7
+190,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
mvneta_max_rx_size_set(pp, pp->pkt_size);
mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
mvneta_max_rx_size_set(pp, pp->pkt_size);
mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
-@@ -300
5,16 +2951
,15 @@ static void mvneta_start_dev(struct mvne
+@@ -300
3,16 +2949
,15 @@ static void mvneta_start_dev(struct mvne
MVNETA_CAUSE_LINK_CHANGE |
MVNETA_CAUSE_PSC_SYNC_CHANGE);
MVNETA_CAUSE_LINK_CHANGE |
MVNETA_CAUSE_PSC_SYNC_CHANGE);
@@
-209,7
+209,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
for_each_online_cpu(cpu) {
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
for_each_online_cpu(cpu) {
struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
-@@ -318
4,99 +3129
,210 @@ static int mvneta_set_mac_addr(struct ne
+@@ -318
2,99 +3127
,210 @@ static int mvneta_set_mac_addr(struct ne
return 0;
}
return 0;
}
@@
-490,7
+490,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Electing a CPU must be done in an atomic way: it should be done
}
/* Electing a CPU must be done in an atomic way: it should be done
-@@ -353
4,10 +3590
,9 @@ static int mvneta_stop(struct net_device
+@@ -353
2,10 +3588
,9 @@ static int mvneta_stop(struct net_device
static int mvneta_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
static int mvneta_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
@@
-503,7
+503,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Ethtool methods */
}
/* Ethtool methods */
-@@ -354
8,44 +3603
,18 @@ mvneta_ethtool_set_link_ksettings(struct
+@@ -354
6,44 +3601
,18 @@ mvneta_ethtool_set_link_ksettings(struct
const struct ethtool_link_ksettings *cmd)
{
struct mvneta_port *pp = netdev_priv(ndev);
const struct ethtool_link_ksettings *cmd)
{
struct mvneta_port *pp = netdev_priv(ndev);
@@
-557,7
+557,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
/* Set interrupt coalescing for ethtools */
}
/* Set interrupt coalescing for ethtools */
-@@ -369
3,26 +3722
,28 @@ static void mvneta_ethtool_update_stats(
+@@ -369
1,26 +3720
,28 @@ static void mvneta_ethtool_update_stats(
{
const struct mvneta_statistic *s;
void __iomem *base = pp->base;
{
const struct mvneta_statistic *s;
void __iomem *base = pp->base;
@@
-591,7
+591,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
}
}
}
-@@ -387
2,7 +3903
,7 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -387
0,7 +3901
,7 @@ const struct ethtool_ops mvneta_eth_tool
.get_rxnfc = mvneta_ethtool_get_rxnfc,
.get_rxfh = mvneta_ethtool_get_rxfh,
.set_rxfh = mvneta_ethtool_set_rxfh,
.get_rxnfc = mvneta_ethtool_get_rxnfc,
.get_rxfh = mvneta_ethtool_get_rxfh,
.set_rxfh = mvneta_ethtool_set_rxfh,
@@
-600,7
+600,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
};
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
};
-@@ -399
9,14 +4030
,13 @@ static int mvneta_probe(struct platform_
+@@ -399
7,14 +4028
,13 @@ static int mvneta_probe(struct platform_
const struct mbus_dram_target_info *dram_target_info;
struct resource *res;
struct device_node *dn = pdev->dev.of_node;
const struct mbus_dram_target_info *dram_target_info;
struct resource *res;
struct device_node *dn = pdev->dev.of_node;
@@
-616,7
+616,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
int tx_csum_limit;
int phy_mode;
int err;
int tx_csum_limit;
int phy_mode;
int err;
-@@ -402
2,31 +4052
,11 @@ static int mvneta_probe(struct platform_
+@@ -402
0,31 +4050
,11 @@ static int mvneta_probe(struct platform_
goto err_free_netdev;
}
goto err_free_netdev;
}
@@
-649,7
+649,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
dev->tx_queue_len = MVNETA_MAX_TXD;
}
dev->tx_queue_len = MVNETA_MAX_TXD;
-@@ -405
7,12 +4067
,7 @@ static int mvneta_probe(struct platform_
+@@ -405
5,12 +4065
,7 @@ static int mvneta_probe(struct platform_
pp = netdev_priv(dev);
spin_lock_init(&pp->lock);
pp = netdev_priv(dev);
spin_lock_init(&pp->lock);
@@
-663,7
+663,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
pp->rxq_def = rxq_def;
pp->rxq_def = rxq_def;
-@@ -407
3,7 +4078
,7 @@ static int mvneta_probe(struct platform_
+@@ -407
1,7 +4076
,7 @@ static int mvneta_probe(struct platform_
pp->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pp->clk)) {
err = PTR_ERR(pp->clk);
pp->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pp->clk)) {
err = PTR_ERR(pp->clk);
@@
-672,7
+672,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
clk_prepare_enable(pp->clk);
}
clk_prepare_enable(pp->clk);
-@@ -41
81,6 +4186
,14 @@ static int mvneta_probe(struct platform_
+@@ -41
79,6 +4184
,14 @@ static int mvneta_probe(struct platform_
dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
@@
-687,7
+687,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
err = register_netdev(dev);
if (err < 0) {
dev_err(&pdev->dev, "failed to register\n");
err = register_netdev(dev);
if (err < 0) {
dev_err(&pdev->dev, "failed to register\n");
-@@ -419
2,14 +4205
,6 @@ static int mvneta_probe(struct platform_
+@@ -419
0,14 +4203
,6 @@ static int mvneta_probe(struct platform_
platform_set_drvdata(pdev, pp->dev);
platform_set_drvdata(pdev, pp->dev);
@@
-702,7
+702,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
return 0;
err_netdev:
return 0;
err_netdev:
-@@ -42
10,16 +4215
,14 @@ err_netdev:
+@@ -42
08,16 +4213
,14 @@ err_netdev:
1 << pp->id);
}
err_free_stats:
1 << pp->id);
}
err_free_stats:
@@
-721,7
+721,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
err_free_irq:
irq_dispose_mapping(dev->irq);
err_free_netdev:
err_free_irq:
irq_dispose_mapping(dev->irq);
err_free_netdev:
-@@ -42
31,7 +4234
,6 @@ err_free_netdev:
+@@ -42
29,7 +4232
,6 @@ err_free_netdev:
static int mvneta_remove(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
static int mvneta_remove(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
@@
-729,7
+729,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
struct mvneta_port *pp = netdev_priv(dev);
unregister_netdev(dev);
struct mvneta_port *pp = netdev_priv(dev);
unregister_netdev(dev);
-@@ -423
9,10 +4241
,8 @@ static int mvneta_remove(struct platform
+@@ -423
7,10 +4239
,8 @@ static int mvneta_remove(struct platform
clk_disable_unprepare(pp->clk);
free_percpu(pp->ports);
free_percpu(pp->stats);
clk_disable_unprepare(pp->clk);
free_percpu(pp->ports);
free_percpu(pp->stats);