[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1214225694-25815-1-git-send-email-sr@denx.de>
Date: Mon, 23 Jun 2008 14:54:54 +0200
From: Stefan Roese <sr@...x.de>
To: linuxppc-dev@...abs.org, netdev@...r.kernel.org
Cc: benh@...nel.crashing.org, Sathya Narayanan <sathyan@...mf1.com>
Subject: [PATCH] ibm_newemac: Fixes kernel crashes when speed of cable connected changes
From: Sathya Narayanan <sathyan@...mf1.com>
The descriptor pointers were not initialized to NIL values, so it was
poiniting to some random addresses which was completely invalid. This
fix takes care of initializing the descriptor to NIL values and clearing
the valid descriptors on clean ring operation.
Signed-off-by: Sathya Narayanan <sathyan@...mf1.com>
Signed-off-by: Stefan Roese <sr@...x.de>
---
drivers/net/ibm_newemac/core.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 5d2108c..6dfc2c9 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1025,7 +1025,7 @@ static void emac_clean_tx_ring(struct emac_instance *dev)
int i;
for (i = 0; i < NUM_TX_BUFF; ++i) {
- if (dev->tx_skb[i]) {
+ if (dev->tx_skb[i] && dev->tx_desc[i].data_ptr) {
dev_kfree_skb(dev->tx_skb[i]);
dev->tx_skb[i] = NULL;
if (dev->tx_desc[i].ctrl & MAL_TX_CTRL_READY)
@@ -2719,6 +2719,10 @@ static int __devinit emac_probe(struct of_device *ofdev,
/* Clean rings */
memset(dev->tx_desc, 0, NUM_TX_BUFF * sizeof(struct mal_descriptor));
memset(dev->rx_desc, 0, NUM_RX_BUFF * sizeof(struct mal_descriptor));
+ for (i = 0; i <= NUM_TX_BUFF; i++)
+ dev->tx_skb[i] = NULL;
+ for (i = 0; i <= NUM_RX_BUFF; i++)
+ dev->rx_skb[i] = NULL;
/* Attach to ZMII, if needed */
if (emac_has_feature(dev, EMAC_FTR_HAS_ZMII) &&
--
1.5.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists