* [PATCH] gianfar: Fix compile regression caused by bea3348e
@ 2007-10-12 13:53 Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Li Yang
2007-10-12 18:48 ` [PATCH] gianfar: Fix compile regression caused by bea3348e Kumar Gala
0 siblings, 2 replies; 10+ messages in thread
From: Li Yang @ 2007-10-12 13:53 UTC (permalink / raw)
To: jgarzik, netdev; +Cc: Li Yang
Signed-off-by: Li Yang <leoli@freescale.com>
---
drivers/net/gianfar.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 0db5e6f..2b758fa 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -261,7 +261,9 @@ static int gfar_probe(struct platform_device *pdev)
dev->hard_start_xmit = gfar_start_xmit;
dev->tx_timeout = gfar_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
+#ifdef CONFIG_GFAR_NAPI
netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT);
+#endif
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = gfar_netpoll;
#endif
@@ -931,6 +933,7 @@ tx_skb_fail:
/* Returns 0 for success. */
static int gfar_enet_open(struct net_device *dev)
{
+ struct gfar_private *priv = netdev_priv(dev);
int err;
napi_enable(&priv->napi);
--
1.5.3.2.104.g41ef
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] gianfar: Fix compile regression caused by 09f75cd7
2007-10-12 13:53 [PATCH] gianfar: Fix compile regression caused by bea3348e Li Yang
@ 2007-10-12 13:53 ` Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Cleanup compile warning caused by 0795af57 Li Yang
` (2 more replies)
2007-10-12 18:48 ` [PATCH] gianfar: Fix compile regression caused by bea3348e Kumar Gala
1 sibling, 3 replies; 10+ messages in thread
From: Li Yang @ 2007-10-12 13:53 UTC (permalink / raw)
To: jgarzik, netdev; +Cc: Li Yang
Signed-off-by: Li Yang <leoli@freescale.com>
---
drivers/net/gianfar.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 2b758fa..6d1456a 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1228,8 +1228,6 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
* starting over will fix the problem. */
static void gfar_timeout(struct net_device *dev)
{
- struct gfar_private *priv = netdev_priv(dev);
-
dev->stats.tx_errors++;
if (dev->flags & IFF_UP) {
@@ -1335,8 +1333,9 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
return skb;
}
-static inline void count_errors(unsigned short status, struct gfar_private *priv)
+static inline void count_errors(unsigned short status, struct net_device *dev)
{
+ struct gfar_private *priv = netdev_priv(dev);
struct net_device_stats *stats = &dev->stats;
struct gfar_extra_stats *estats = &priv->extra_stats;
@@ -1530,7 +1529,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
dev->stats.rx_bytes += pkt_len;
} else {
- count_errors(bdp->status, priv);
+ count_errors(bdp->status, dev);
if (skb)
dev_kfree_skb_any(skb);
--
1.5.3.2.104.g41ef
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] gianfar: Cleanup compile warning caused by 0795af57
2007-10-12 13:53 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Li Yang
@ 2007-10-12 13:53 ` Li Yang
2007-10-12 18:49 ` Kumar Gala
2007-10-15 18:41 ` Jeff Garzik
2007-10-12 18:49 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Kumar Gala
2007-10-16 5:41 ` Kumar Gala
2 siblings, 2 replies; 10+ messages in thread
From: Li Yang @ 2007-10-12 13:53 UTC (permalink / raw)
To: jgarzik, netdev; +Cc: Li Yang
Signed-off-by: Li Yang <leoli@freescale.com>
---
drivers/net/gianfar.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6d1456a..c15fb1f 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -168,7 +168,6 @@ static int gfar_probe(struct platform_device *pdev)
struct gfar_private *priv = NULL;
struct gianfar_platform_data *einfo;
struct resource *r;
- int idx;
int err = 0;
DECLARE_MAC_BUF(mac);
--
1.5.3.2.104.g41ef
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] gianfar: Fix compile regression caused by 09f75cd7
2007-10-12 13:53 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Cleanup compile warning caused by 0795af57 Li Yang
@ 2007-10-12 18:49 ` Kumar Gala
2007-10-16 5:41 ` Kumar Gala
2 siblings, 0 replies; 10+ messages in thread
From: Kumar Gala @ 2007-10-12 18:49 UTC (permalink / raw)
To: Li Yang; +Cc: jgarzik, netdev
On Oct 12, 2007, at 8:53 AM, Li Yang wrote:
> Signed-off-by: Li Yang <leoli@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gianfar: Fix compile regression caused by 09f75cd7
2007-10-12 13:53 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Cleanup compile warning caused by 0795af57 Li Yang
2007-10-12 18:49 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Kumar Gala
@ 2007-10-16 5:41 ` Kumar Gala
2007-10-16 5:48 ` Jeff Garzik
2 siblings, 1 reply; 10+ messages in thread
From: Kumar Gala @ 2007-10-16 5:41 UTC (permalink / raw)
To: jgarzik; +Cc: Li Yang, netdev
On Fri, 12 Oct 2007, Li Yang wrote:
> Signed-off-by: Li Yang <leoli@freescale.com>
> ---
> drivers/net/gianfar.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
this patch got lost.
- k
>
> diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
> index 2b758fa..6d1456a 100644
> --- a/drivers/net/gianfar.c
> +++ b/drivers/net/gianfar.c
> @@ -1228,8 +1228,6 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
> * starting over will fix the problem. */
> static void gfar_timeout(struct net_device *dev)
> {
> - struct gfar_private *priv = netdev_priv(dev);
> -
> dev->stats.tx_errors++;
>
> if (dev->flags & IFF_UP) {
> @@ -1335,8 +1333,9 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
> return skb;
> }
>
> -static inline void count_errors(unsigned short status, struct gfar_private *priv)
> +static inline void count_errors(unsigned short status, struct net_device *dev)
> {
> + struct gfar_private *priv = netdev_priv(dev);
> struct net_device_stats *stats = &dev->stats;
> struct gfar_extra_stats *estats = &priv->extra_stats;
>
> @@ -1530,7 +1529,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
>
> dev->stats.rx_bytes += pkt_len;
> } else {
> - count_errors(bdp->status, priv);
> + count_errors(bdp->status, dev);
>
> if (skb)
> dev_kfree_skb_any(skb);
> --
> 1.5.3.2.104.g41ef
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gianfar: Fix compile regression caused by bea3348e
2007-10-12 13:53 [PATCH] gianfar: Fix compile regression caused by bea3348e Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Li Yang
@ 2007-10-12 18:48 ` Kumar Gala
1 sibling, 0 replies; 10+ messages in thread
From: Kumar Gala @ 2007-10-12 18:48 UTC (permalink / raw)
To: Li Yang; +Cc: jgarzik, netdev
On Oct 12, 2007, at 8:53 AM, Li Yang wrote:
> Signed-off-by: Li Yang <leoli@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-10-16 5:48 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-12 13:53 [PATCH] gianfar: Fix compile regression caused by bea3348e Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Li Yang
2007-10-12 13:53 ` [PATCH] gianfar: Cleanup compile warning caused by 0795af57 Li Yang
2007-10-12 18:49 ` Kumar Gala
2007-10-15 18:41 ` Jeff Garzik
2007-10-16 5:39 ` Kumar Gala
2007-10-12 18:49 ` [PATCH] gianfar: Fix compile regression caused by 09f75cd7 Kumar Gala
2007-10-16 5:41 ` Kumar Gala
2007-10-16 5:48 ` Jeff Garzik
2007-10-12 18:48 ` [PATCH] gianfar: Fix compile regression caused by bea3348e Kumar Gala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).