|
@@ -1509,9 +1509,9 @@ static void intelxl_poll ( struct net_device *netdev ) {
|
1509
|
1509
|
|
1510
|
1510
|
/* Acknowledge interrupts, if applicable */
|
1511
|
1511
|
if ( netdev_irq_enabled ( netdev ) ) {
|
1512
|
|
- writel ( ( INTELXL_PFINT_DYN_CTL0_CLEARPBA |
|
1513
|
|
- INTELXL_PFINT_DYN_CTL0_INTENA_MASK ),
|
1514
|
|
- intelxl->regs + INTELXL_PFINT_DYN_CTL0 );
|
|
1512
|
+ writel ( ( INTELXL_INT_DYN_CTL_CLEARPBA |
|
|
1513
|
+ INTELXL_INT_DYN_CTL_INTENA_MASK ),
|
|
1514
|
+ ( intelxl->regs + intelxl->intr ) );
|
1515
|
1515
|
}
|
1516
|
1516
|
|
1517
|
1517
|
/* Poll for completed packets */
|
|
@@ -1536,12 +1536,8 @@ static void intelxl_poll ( struct net_device *netdev ) {
|
1536
|
1536
|
static void intelxl_irq ( struct net_device *netdev, int enable ) {
|
1537
|
1537
|
struct intelxl_nic *intelxl = netdev->priv;
|
1538
|
1538
|
|
1539
|
|
- if ( enable ) {
|
1540
|
|
- writel ( INTELXL_PFINT_DYN_CTL0_INTENA,
|
1541
|
|
- intelxl->regs + INTELXL_PFINT_DYN_CTL0 );
|
1542
|
|
- } else {
|
1543
|
|
- writel ( 0, intelxl->regs + INTELXL_PFINT_DYN_CTL0 );
|
1544
|
|
- }
|
|
1539
|
+ writel ( ( enable ? INTELXL_INT_DYN_CTL_INTENA : 0 ),
|
|
1540
|
+ ( intelxl->regs + intelxl->intr ) );
|
1545
|
1541
|
}
|
1546
|
1542
|
|
1547
|
1543
|
/** Network device operations */
|
|
@@ -1585,6 +1581,7 @@ static int intelxl_probe ( struct pci_device *pci ) {
|
1585
|
1581
|
netdev->dev = &pci->dev;
|
1586
|
1582
|
memset ( intelxl, 0, sizeof ( *intelxl ) );
|
1587
|
1583
|
intelxl->pf = PCI_FUNC ( pci->busdevfn );
|
|
1584
|
+ intelxl->intr = INTELXL_PFINT_DYN_CTL0;
|
1588
|
1585
|
intelxl_init_admin ( &intelxl->command, INTELXL_ADMIN_CMD,
|
1589
|
1586
|
&intelxl_admin_offsets );
|
1590
|
1587
|
intelxl_init_admin ( &intelxl->event, INTELXL_ADMIN_EVT,
|