diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-10-29 13:31:39 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 14:17:05 -0400 |
| commit | e71180f3689e00c5a1095925352a72dacdd62e34 (patch) | |
| tree | dc60596c2ea85b8f9f47a1c3af3c3da4041e3225 /drivers/net | |
| parent | eef55ac7bf16669cb022db30143d0a6d8cb1f5e6 (diff) | |
| download | op-kernel-dev-e71180f3689e00c5a1095925352a72dacdd62e34.zip op-kernel-dev-e71180f3689e00c5a1095925352a72dacdd62e34.tar.gz | |
[PATCH] prism54: Free skb after disabling interrupts
The dev_kfree_skb in islpci_eth_transmit happens while irqs are still
disabled, so either dev_kfree_skb_irq needs to be used or the skb
needs to be freed after irqs have been enabled again. This patch
should fix it.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 0975dd4..3b49efa 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c @@ -241,12 +241,10 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) return 0; drop_free: - /* free the skbuf structure before aborting */ - dev_kfree_skb(skb); - skb = NULL; - priv->statistics.tx_dropped++; spin_unlock_irqrestore(&priv->slock, flags); + dev_kfree_skb(skb); + skb = NULL; return err; } |
