git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
sk98lin
/
skge.c
diff --git
a/drivers/net/sk98lin/skge.c
b/drivers/net/sk98lin/skge.c
index
38a26df
..
ee62845
100644
(file)
--- a/
drivers/net/sk98lin/skge.c
+++ b/
drivers/net/sk98lin/skge.c
@@
-570,9
+570,9
@@
SK_BOOL DualNet;
spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
if (pAC->GIni.GIMacsFound == 2) {
spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
if (pAC->GIni.GIMacsFound == 2) {
- Ret = request_irq(dev->irq, SkGeIsr,
SA_SHIRQ
, "sk98lin", dev);
+ Ret = request_irq(dev->irq, SkGeIsr,
IRQF_SHARED
, "sk98lin", dev);
} else if (pAC->GIni.GIMacsFound == 1) {
} else if (pAC->GIni.GIMacsFound == 1) {
- Ret = request_irq(dev->irq, SkGeIsrOnePort,
SA_SHIRQ
,
+ Ret = request_irq(dev->irq, SkGeIsrOnePort,
IRQF_SHARED
,
"sk98lin", dev);
} else {
printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
"sk98lin", dev);
} else {
printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
@@
-1525,7
+1525,7
@@
struct sk_buff *pMessage) /* pointer to send-message */
** This is to resolve faulty padding by the HW with 0xaa bytes.
*/
if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
** This is to resolve faulty padding by the HW with 0xaa bytes.
*/
if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
- if (
(pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL
) {
+ if (
skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)
) {
spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
return 0;
}
spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
return 0;
}
@@
-5073,9
+5073,9
@@
static int skge_resume(struct pci_dev *pdev)
pci_enable_device(pdev);
pci_set_master(pdev);
if (pAC->GIni.GIMacsFound == 2)
pci_enable_device(pdev);
pci_set_master(pdev);
if (pAC->GIni.GIMacsFound == 2)
- ret = request_irq(dev->irq, SkGeIsr,
SA_SHIRQ
, "sk98lin", dev);
+ ret = request_irq(dev->irq, SkGeIsr,
IRQF_SHARED
, "sk98lin", dev);
else
else
- ret = request_irq(dev->irq, SkGeIsrOnePort,
SA_SHIRQ
, "sk98lin", dev);
+ ret = request_irq(dev->irq, SkGeIsrOnePort,
IRQF_SHARED
, "sk98lin", dev);
if (ret) {
printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
pAC->AllocFlag &= ~SK_ALLOC_IRQ;
if (ret) {
printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
pAC->AllocFlag &= ~SK_ALLOC_IRQ;