aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c6
-rw-r--r--drivers/net/ethernet/freescale/gianfar.h1
-rw-r--r--drivers/net/ethernet/freescale/gianfar_ethtool.c1
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 434b31bd88e6..96fbe3548243 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2695,8 +2695,6 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
2695 struct gfar_private *priv = netdev_priv(dev); 2695 struct gfar_private *priv = netdev_priv(dev);
2696 struct rxfcb *fcb = NULL; 2696 struct rxfcb *fcb = NULL;
2697 2697
2698 gro_result_t ret;
2699
2700 /* fcb is at the beginning if exists */ 2698 /* fcb is at the beginning if exists */
2701 fcb = (struct rxfcb *)skb->data; 2699 fcb = (struct rxfcb *)skb->data;
2702 2700
@@ -2735,10 +2733,8 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
2735 __vlan_hwaccel_put_tag(skb, fcb->vlctl); 2733 __vlan_hwaccel_put_tag(skb, fcb->vlctl);
2736 2734
2737 /* Send the packet up the stack */ 2735 /* Send the packet up the stack */
2738 ret = napi_gro_receive(napi, skb); 2736 napi_gro_receive(napi, skb);
2739 2737
2740 if (unlikely(GRO_DROP == ret))
2741 atomic64_inc(&priv->extra_stats.kernel_dropped);
2742} 2738}
2743 2739
2744/* gfar_clean_rx_ring() -- Processes each frame in the rx ring 2740/* gfar_clean_rx_ring() -- Processes each frame in the rx ring
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index eec87eaaae92..04b552cd419d 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -629,7 +629,6 @@ struct rmon_mib
629}; 629};
630 630
631struct gfar_extra_stats { 631struct gfar_extra_stats {
632 atomic64_t kernel_dropped;
633 atomic64_t rx_large; 632 atomic64_t rx_large;
634 atomic64_t rx_short; 633 atomic64_t rx_short;
635 atomic64_t rx_nonoctet; 634 atomic64_t rx_nonoctet;
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 8248df760aad..4e7118f9f075 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -66,7 +66,6 @@ static void gfar_gdrvinfo(struct net_device *dev,
66 struct ethtool_drvinfo *drvinfo); 66 struct ethtool_drvinfo *drvinfo);
67 67
68static const char stat_gstrings[][ETH_GSTRING_LEN] = { 68static const char stat_gstrings[][ETH_GSTRING_LEN] = {
69 "rx-dropped-by-kernel",
70 "rx-large-frame-errors", 69 "rx-large-frame-errors",
71 "rx-short-frame-errors", 70 "rx-short-frame-errors",
72 "rx-non-octet-errors", 71 "rx-non-octet-errors",