aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2014-05-22 19:07:03 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-23 15:31:49 -0400
commitdc03e21a54d9aa77751dd545a8d3aefa80d43833 (patch)
tree0421ee0814f5db0888d761b7398356447c9c2779
parent56ecd2cc3810b76fc88d39369d23791fbd9adf81 (diff)
net: mvneta: Remove unneeded 'weigth' field
The 'weight' field is only used to pass the weigth to napi initialization function. This commit removes the field, and instead uses a fixed value to initialize the napi context. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 02dd075acb56..b8919fa6ed27 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -283,9 +283,6 @@ struct mvneta_port {
283 u32 cause_rx_tx; 283 u32 cause_rx_tx;
284 struct napi_struct napi; 284 struct napi_struct napi;
285 285
286 /* Napi weight */
287 int weight;
288
289 /* Core clock */ 286 /* Core clock */
290 struct clk *clk; 287 struct clk *clk;
291 u8 mcast_count[256]; 288 u8 mcast_count[256];
@@ -2968,8 +2965,6 @@ static int mvneta_probe(struct platform_device *pdev)
2968 dev->ethtool_ops = &mvneta_eth_tool_ops; 2965 dev->ethtool_ops = &mvneta_eth_tool_ops;
2969 2966
2970 pp = netdev_priv(dev); 2967 pp = netdev_priv(dev);
2971
2972 pp->weight = MVNETA_RX_POLL_WEIGHT;
2973 pp->phy_node = phy_node; 2968 pp->phy_node = phy_node;
2974 pp->phy_interface = phy_mode; 2969 pp->phy_interface = phy_mode;
2975 2970
@@ -3030,7 +3025,7 @@ static int mvneta_probe(struct platform_device *pdev)
3030 if (dram_target_info) 3025 if (dram_target_info)
3031 mvneta_conf_mbus_windows(pp, dram_target_info); 3026 mvneta_conf_mbus_windows(pp, dram_target_info);
3032 3027
3033 netif_napi_add(dev, &pp->napi, mvneta_poll, pp->weight); 3028 netif_napi_add(dev, &pp->napi, mvneta_poll, MVNETA_RX_POLL_WEIGHT);
3034 3029
3035 dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; 3030 dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
3036 dev->hw_features |= dev->features; 3031 dev->hw_features |= dev->features;