From: khc@pm.waw.pl <khc@pm.waw.pl>
Date: Sat, 19 Mar 2005 05:47:12 +0000 (-0800)
Subject: [PATCH] Fix kernel panic on receive with WAN Hitachi SCA HD6457x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f028fc8d2c9175bd87abe2481a60d272d0022fc;p=thirdparty%2Fkernel%2Fstable.git

[PATCH] Fix kernel panic on receive with WAN Hitachi SCA HD6457x

Another patch for 2.6.11.x: already in main tree, fixes kernel panic on
receive with WAN cards based on Hitachi SCA/SCA-II: N2, C101, PCI200SYN.
The attached patch fixes NULL pointer dereference on RX.

Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c
index 05107bc0fd380..d3743321a9777 100644
--- a/drivers/net/wan/hd6457x.c
+++ b/drivers/net/wan/hd6457x.c
@@ -315,7 +315,7 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc, u1
 #endif
 	stats->rx_packets++;
 	stats->rx_bytes += skb->len;
-	skb->dev->last_rx = jiffies;
+	dev->last_rx = jiffies;
 	skb->protocol = hdlc_type_trans(skb, dev);
 	netif_rx(skb);
 }