tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sky2: ifdown kills irq mask

Bringing down a port also masks off the status and other IRQ's
needed for device to function due to missing paren's.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

Stephen Hemminger f4ea431b 6810b548

+3 -2
unified split
+3 -2
drivers/net/sky2.c
··· 122 /* Avoid conditionals by using array */ 123 static const unsigned txqaddr[] = { Q_XA1, Q_XA2 }; 124 static const unsigned rxqaddr[] = { Q_R1, Q_R2 }; 125 126 /* This driver supports yukon2 chipset only */ 127 static const char *yukon2_name[] = { ··· 1051 1052 /* Enable interrupts from phy/mac for port */ 1053 imask = sky2_read32(hw, B0_IMSK); 1054 - imask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; 1055 sky2_write32(hw, B0_IMSK, imask); 1056 1057 return 0; ··· 1402 1403 /* Disable port IRQ */ 1404 imask = sky2_read32(hw, B0_IMSK); 1405 - imask &= ~(sky2->port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; 1406 sky2_write32(hw, B0_IMSK, imask); 1407 1408 /* turn off LED's */
··· 122 /* Avoid conditionals by using array */ 123 static const unsigned txqaddr[] = { Q_XA1, Q_XA2 }; 124 static const unsigned rxqaddr[] = { Q_R1, Q_R2 }; 125 + static const u32 portirq_msk[] = { Y2_IS_PORT_1, Y2_IS_PORT_2 }; 126 127 /* This driver supports yukon2 chipset only */ 128 static const char *yukon2_name[] = { ··· 1050 1051 /* Enable interrupts from phy/mac for port */ 1052 imask = sky2_read32(hw, B0_IMSK); 1053 + imask |= portirq_msk[port]; 1054 sky2_write32(hw, B0_IMSK, imask); 1055 1056 return 0; ··· 1401 1402 /* Disable port IRQ */ 1403 imask = sky2_read32(hw, B0_IMSK); 1404 + imask &= ~portirq_msk[port]; 1405 sky2_write32(hw, B0_IMSK, imask); 1406 1407 /* turn off LED's */