Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 953d2768 authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller
Browse files

gianfar: Remove superfluous kernel_dropped local counter 



The GRO_DROP return code is handled by the core network layer.
The current kernel approach is to factorize this kind of statistics into
the upper layers, instead of having all the drivers maintaining them.

Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6e1160e

drivers/net/ethernet/freescale/gianfar.c

+1 −5
Original line number Diff line number Diff line
@@ -2695,8 +2695,6 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, 
	struct gfar_private *priv = netdev_priv(dev);

	struct rxfcb *fcb = NULL;



	gro_result_t ret;



	/* fcb is at the beginning if exists */

	fcb = (struct rxfcb *)skb->data;
@@ -2735,10 +2733,8 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, 
		__vlan_hwaccel_put_tag(skb, fcb->vlctl);



	/* Send the packet up the stack */

	ret = napi_gro_receive(napi, skb);

	napi_gro_receive(napi, skb);



	if (unlikely(GRO_DROP == ret))

		atomic64_inc(&priv->extra_stats.kernel_dropped);

}



/* gfar_clean_rx_ring() -- Processes each frame in the rx ring

drivers/net/ethernet/freescale/gianfar.h

+0 −1
Original line number Diff line number Diff line
@@ -629,7 +629,6 @@ struct rmon_mib 
};



struct gfar_extra_stats {

	atomic64_t kernel_dropped;

	atomic64_t rx_large;

	atomic64_t rx_short;

	atomic64_t rx_nonoctet;

drivers/net/ethernet/freescale/gianfar_ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static void gfar_gdrvinfo(struct net_device *dev, 
			  struct ethtool_drvinfo *drvinfo);



static const char stat_gstrings[][ETH_GSTRING_LEN] = {

	"rx-dropped-by-kernel",

	"rx-large-frame-errors",

	"rx-short-frame-errors",

	"rx-non-octet-errors",