Attachment 147255 Details for Bug 217930 – A new, simpler patch to enable 8139cp netdump

[patch] A new, simpler patch to enable 8139cp netdump

linux-2.4.21-8139-netpoll-6.patch (text/plain), 1.99 KB, created by Chris Lalancette on 2007-02-02 21:32:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-02-02 21:32:22 UTC

Size: 1.99 KB

patch

obsolete

>--- linux-2.4.21/drivers/net/8139cp.c.orig	2007-02-02 15:58:00.000000000 -0500
>+++ linux-2.4.21/drivers/net/8139cp.c	2007-02-02 15:59:35.000000000 -0500
>@@ -756,17 +756,18 @@ static int cp_start_xmit (struct sk_buff
> {
> 	struct cp_private *cp = dev->priv;
> 	unsigned entry;
>+	unsigned long flags;
> 	u32 eor;
> #if CP_VLAN_TAG_USED
> 	u32 vlan_tag = 0;
> #endif
> 
>-	spin_lock_irq(&cp->lock);
>+	spin_lock_irqsave(&cp->lock, flags);
> 
> 	/* This is a hard error, log it. */
> 	if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) {
> 		netif_stop_queue(dev);
>-		spin_unlock_irq(&cp->lock);
>+		spin_unlock_irqrestore(&cp->lock, flags);
> 		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
> 		       dev->name);
> 		return 1;
>@@ -906,7 +907,7 @@ static int cp_start_xmit (struct sk_buff
> 	if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
> 		netif_stop_queue(dev);
> 
>-	spin_unlock_irq(&cp->lock);
>+	spin_unlock_irqrestore(&cp->lock, flags);
> 
> 	cpw8(TxPoll, NormalTxPoll);
> 	dev->trans_start = jiffies;
>@@ -927,8 +928,6 @@ static void __cp_set_rx_mode (struct net
> 	/* Note: do not reorder, GCC is clever about common statements. */
> 	if (dev->flags & IFF_PROMISC) {
> 		/* Unconditionally log net taps. */
>-		printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
>-			dev->name);
> 		rx_mode =
> 		    AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
> 		    AcceptAllPhys;
>@@ -1693,6 +1692,17 @@ static void cp_vlan_rx_kill_vid(struct n
> }
> #endif
> 
>+#ifdef HAVE_POLL_CONTROLLER
>+static void
>+cp_netpoll(struct net_device *dev)
>+{
>+	struct cp_private *cp = dev->priv;
>+	if (!netdump_mode) disable_irq(cp->pdev->irq);
>+	cp_interrupt(cp->pdev->irq, dev, NULL);
>+	if (!netdump_mode) enable_irq(cp->pdev->irq);
>+}
>+#endif
>+
> /* Serial EEPROM section. */
> 
> /*  EEPROM_Ctrl bits. */
>@@ -1889,6 +1899,9 @@ static int __devinit cp_init_one (struct
> 	dev->vlan_rx_kill_vid = cp_vlan_rx_kill_vid;
> #endif
> 
>+#ifdef HAVE_POLL_CONTROLLER
>+	dev->poll_controller = cp_netpoll;
>+#endif
> 	dev->irq = pdev->irq;
> 
> 	rc = register_netdev(dev);

Actions: View | Diff

Attachments on bug 217930: 142515 | 144048 | 147255