Attachment 160849 Details for Bug 228733 – patch to fix null dev pointer

[patch] patch to fix null dev pointer

debug.patch (text/plain), 1.65 KB, created by Neil Horman on 2007-08-07 20:03:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-08-07 20:03:04 UTC

Size: 1.65 KB

patch

obsolete

>--- linux-2.6.9/drivers/net/sky2.c.orig	2007-08-07 12:24:22.000000000 -0400
>+++ linux-2.6.9/drivers/net/sky2.c	2007-08-07 14:02:36.000000000 -0400
>@@ -1933,7 +1933,7 @@ static inline void sky2_tx_done(struct n
> }
> 
> /* Process status response ring */
>-static int sky2_status_intr(struct sky2_hw *hw, int to_do)
>+static int sky2_status_intr(struct sky2_hw *hw, struct net_device *dev, int to_do)
> {
> 	struct sky2_port *sky2;
> 	int work_done = 0;
>@@ -1944,15 +1944,13 @@ static int sky2_status_intr(struct sky2_
> 
> 	while (hw->st_idx != hwidx) {
> 		struct sky2_status_le *le  = hw->st_le + hw->st_idx;
>-		struct net_device *dev;
> 		struct sk_buff *skb;
> 		u32 status;
> 		u16 length;
> 
> 		hw->st_idx = RING_NEXT(hw->st_idx, STATUS_RING_SIZE);
>-
>+		printk(KERN_CRIT "SKY2 DEBUG: le->link = %d\n",le->link);
> 		BUG_ON(le->link >= 2);
>-		dev = hw->dev[le->link];
> 
> 		sky2 = netdev_priv(dev);
> 		length = le->length;
>@@ -2233,7 +2231,7 @@ static int sky2_poll(struct net_device *
> 	if (status & Y2_IS_CHK_TXA2)
> 		sky2_descriptor_error(hw, 1, "transmit", Y2_IS_CHK_TXA2);
> 
>-	work_done = sky2_status_intr(hw, work_limit);
>+	work_done = sky2_status_intr(hw, dev0, work_limit);
> 	if (work_done < work_limit) {
> 		netif_rx_complete(dev0);
> 
>--- linux-2.6.9/net/core/dev.c.orig	2007-08-07 12:27:26.000000000 -0400
>+++ linux-2.6.9/net/core/dev.c	2007-08-07 12:28:17.000000000 -0400
>@@ -1658,6 +1658,9 @@ int netif_receive_skb(struct sk_buff *sk
> 	int ret = NET_RX_DROP;
> 	unsigned short type;
> 
>+	printk(KERN_CRIT "NETIF_RECEIVE_SKB: SKB = %p\n",skb);
>+	printk(KERN_CRIT "NETIF_RECEIVE_SKB: DEV = %p\n",skb->dev);
>+
> #ifdef CONFIG_NETPOLL
> 	if (skb->dev->poll && netpoll_rx(skb))
> 		return NET_RX_DROP;

Actions: View | Diff

Attachments on bug 228733: 148077 | 148078 | 149028 | 149410 | 149663 | 150978 | 160831 | 160839 | 160849 | 160924 | 161265 | 302652