diff options
author | Claudiu Manoil <claudiu.manoil@freescale.com> | 2013-02-14 00:00:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-14 13:32:24 -0500 |
commit | 61db26c6454b5a0bd74ec23968b568e38ea8321a (patch) | |
tree | 00a84da9b2bdefa48559c8f14d6bae56194520a8 | |
parent | bd9e89f29427f4accd62ce5dfe1547549f0d3fbc (diff) |
gianfar: gfar_process_frame returns void
No return code is expected from gfar_process_frame(), hence
change it to return void.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index af0f4d6b9edf..d70f74c634de 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c | |||
@@ -133,8 +133,8 @@ static void gfar_netpoll(struct net_device *dev); | |||
133 | #endif | 133 | #endif |
134 | int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit); | 134 | int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit); |
135 | static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue); | 135 | static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue); |
136 | static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, | 136 | static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, |
137 | int amount_pull, struct napi_struct *napi); | 137 | int amount_pull, struct napi_struct *napi); |
138 | void gfar_halt(struct net_device *dev); | 138 | void gfar_halt(struct net_device *dev); |
139 | static void gfar_halt_nodisable(struct net_device *dev); | 139 | static void gfar_halt_nodisable(struct net_device *dev); |
140 | void gfar_start(struct net_device *dev); | 140 | void gfar_start(struct net_device *dev); |
@@ -2692,8 +2692,8 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb) | |||
2692 | 2692 | ||
2693 | 2693 | ||
2694 | /* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */ | 2694 | /* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */ |
2695 | static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, | 2695 | static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, |
2696 | int amount_pull, struct napi_struct *napi) | 2696 | int amount_pull, struct napi_struct *napi) |
2697 | { | 2697 | { |
2698 | struct gfar_private *priv = netdev_priv(dev); | 2698 | struct gfar_private *priv = netdev_priv(dev); |
2699 | struct rxfcb *fcb = NULL; | 2699 | struct rxfcb *fcb = NULL; |
@@ -2742,8 +2742,6 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, | |||
2742 | 2742 | ||
2743 | if (unlikely(GRO_DROP == ret)) | 2743 | if (unlikely(GRO_DROP == ret)) |
2744 | atomic64_inc(&priv->extra_stats.kernel_dropped); | 2744 | atomic64_inc(&priv->extra_stats.kernel_dropped); |
2745 | |||
2746 | return 0; | ||
2747 | } | 2745 | } |
2748 | 2746 | ||
2749 | /* gfar_clean_rx_ring() -- Processes each frame in the rx ring | 2747 | /* gfar_clean_rx_ring() -- Processes each frame in the rx ring |