diff options
| author | Claudiu Manoil <claudiu.manoil@freescale.com> | 2015-07-13 16:22:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-16 03:13:24 +0300 |
| commit | f23223f15fd7d359a08ea346a0a537ccaf417014 (patch) | |
| tree | 912d0f0fd67774ffe7352436abdc7ff4c1e39f25 /drivers/net/ethernet/freescale/gianfar.h | |
| parent | f966082e2065d223942cc40e0bc4841f84f0604d (diff) | |
| download | linux-f23223f15fd7d359a08ea346a0a537ccaf417014.tar.xz | |
gianfar: Use ndev, more Rx path cleanup
Use "ndev" instead of "dev", as the rx queue back pointer
to a net_device struct, to avoid name clashing with a
"struct device" reference. This prepares the addition of a
"struct device" back pointer to the rx queue structure.
Remove duplicated rxq registration in the process.
Move napi_gro_receive() outside gfar_process_frame().
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.h')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h index cadb068cb37f..edf8529ed356 100644 --- a/drivers/net/ethernet/freescale/gianfar.h +++ b/drivers/net/ethernet/freescale/gianfar.h @@ -1022,7 +1022,7 @@ struct rx_q_stats { * @next_to_use: index of the next buffer to be alloc'd * @next_to_clean: index of the next buffer to be cleaned * @qindex: index of this queue - * @dev: back pointer to the dev structure + * @ndev: back pointer to net_device * @rx_ring_size: Rx ring size * @rxcoalescing: enable/disable rx-coalescing * @rxic: receive interrupt coalescing vlaue @@ -1031,7 +1031,7 @@ struct rx_q_stats { struct gfar_priv_rx_q { struct sk_buff **rx_skbuff __aligned(SMP_CACHE_BYTES); struct rxbd8 *rx_bd_base; - struct net_device *dev; + struct net_device *ndev; struct gfar_priv_grp *grp; u16 rx_ring_size; u16 qindex; |