Commit d8ccf29a authored by Linus Torvalds's avatar Linus Torvalds

Import 2.3.44pre7

parent 562b2925
......@@ -384,7 +384,7 @@ static struct irqaction irq2 = { no_action, 0, 0, "cascade", NULL, NULL};
#endif
void init_ISA_irqs (void)
void __init init_ISA_irqs (void)
{
int i;
......
......@@ -1156,7 +1156,7 @@ static void mc32_interrupt(int irq, void *dev_id, struct pt_regs * regs)
basically a FIFO queue of buffers matching
the card ring */
lp->net_stats.tx_bytes+=lp->tx_skb[lp->tx_skb_top]->len;
dev_kfree_skb(lp->tx_skb[lp->tx_skb_top]);
dev_kfree_skb_irq(lp->tx_skb[lp->tx_skb_top]);
lp->tx_skb[lp->tx_skb_top]=NULL;
lp->tx_skb_top++;
lp->tx_skb_top&=(TX_RING_MAX-1);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment