From 5f2cc9b8ffdd003d10c7e16f94c62676d0be2b5e Mon Sep 17 00:00:00 2001 From: Claudiu Manoil Date: Thu, 14 Feb 2013 05:00:05 +0000 Subject: [PATCH] --- yaml --- r: 352467 b: refs/heads/master c: 61db26c6454b5a0bd74ec23968b568e38ea8321a h: refs/heads/master i: 352465: e1a0c48afca03e3bb228ec7424742ef00f235a5d 352463: 1080b1261df18af5237be594fda306c49b42800a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/gianfar.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f99ff7d544fc..965c91b707a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd9e89f29427f4accd62ce5dfe1547549f0d3fbc +refs/heads/master: 61db26c6454b5a0bd74ec23968b568e38ea8321a diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c index af0f4d6b9edf..d70f74c634de 100644 --- a/trunk/drivers/net/ethernet/freescale/gianfar.c +++ b/trunk/drivers/net/ethernet/freescale/gianfar.c @@ -133,8 +133,8 @@ static void gfar_netpoll(struct net_device *dev); #endif int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit); static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue); -static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, - int amount_pull, struct napi_struct *napi); +static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, + int amount_pull, struct napi_struct *napi); void gfar_halt(struct net_device *dev); static void gfar_halt_nodisable(struct net_device *dev); void gfar_start(struct net_device *dev); @@ -2692,8 +2692,8 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb) /* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */ -static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, - int amount_pull, struct napi_struct *napi) +static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, + int amount_pull, struct napi_struct *napi) { struct gfar_private *priv = netdev_priv(dev); struct rxfcb *fcb = NULL; @@ -2742,8 +2742,6 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, if (unlikely(GRO_DROP == ret)) atomic64_inc(&priv->extra_stats.kernel_dropped); - - return 0; } /* gfar_clean_rx_ring() -- Processes each frame in the rx ring