diff options
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 2a467778efc7..51cc1e60b8c4 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -143,9 +143,9 @@ module_param_array(options, int, NULL, 0); | |||
143 | module_param_array(full_duplex, int, NULL, 0); | 143 | module_param_array(full_duplex, int, NULL, 0); |
144 | MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)"); | 144 | MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)"); |
145 | MODULE_PARM_DESC(debug, "DP8381x default debug level"); | 145 | MODULE_PARM_DESC(debug, "DP8381x default debug level"); |
146 | MODULE_PARM_DESC(rx_copybreak, | 146 | MODULE_PARM_DESC(rx_copybreak, |
147 | "DP8381x copy breakpoint for copy-only-tiny-frames"); | 147 | "DP8381x copy breakpoint for copy-only-tiny-frames"); |
148 | MODULE_PARM_DESC(options, | 148 | MODULE_PARM_DESC(options, |
149 | "DP8381x: Bits 0-3: media type, bit 17: full duplex"); | 149 | "DP8381x: Bits 0-3: media type, bit 17: full duplex"); |
150 | MODULE_PARM_DESC(full_duplex, "DP8381x full duplex setting(s) (1)"); | 150 | MODULE_PARM_DESC(full_duplex, "DP8381x full duplex setting(s) (1)"); |
151 | 151 | ||
@@ -244,7 +244,7 @@ enum { | |||
244 | MII_EN_SCRM = 0x0004, /* enable scrambler (tp) */ | 244 | MII_EN_SCRM = 0x0004, /* enable scrambler (tp) */ |
245 | }; | 245 | }; |
246 | 246 | ||
247 | 247 | ||
248 | /* array of board data directly indexed by pci_tbl[x].driver_data */ | 248 | /* array of board data directly indexed by pci_tbl[x].driver_data */ |
249 | static const struct { | 249 | static const struct { |
250 | const char *name; | 250 | const char *name; |
@@ -414,7 +414,7 @@ enum TxConfig_bits { | |||
414 | TxCarrierIgn = 0x80000000 | 414 | TxCarrierIgn = 0x80000000 |
415 | }; | 415 | }; |
416 | 416 | ||
417 | /* | 417 | /* |
418 | * Tx Configuration: | 418 | * Tx Configuration: |
419 | * - 256 byte DMA burst length | 419 | * - 256 byte DMA burst length |
420 | * - fill threshold 512 bytes (i.e. restart DMA when 512 bytes are free) | 420 | * - fill threshold 512 bytes (i.e. restart DMA when 512 bytes are free) |
@@ -672,7 +672,7 @@ static void move_int_phy(struct net_device *dev, int addr) | |||
672 | void __iomem *ioaddr = ns_ioaddr(dev); | 672 | void __iomem *ioaddr = ns_ioaddr(dev); |
673 | int target = 31; | 673 | int target = 31; |
674 | 674 | ||
675 | /* | 675 | /* |
676 | * The internal phy is visible on the external mii bus. Therefore we must | 676 | * The internal phy is visible on the external mii bus. Therefore we must |
677 | * move it away before we can send commands to an external phy. | 677 | * move it away before we can send commands to an external phy. |
678 | * There are two addresses we must avoid: | 678 | * There are two addresses we must avoid: |
@@ -1095,7 +1095,7 @@ static void init_phy_fixup(struct net_device *dev) | |||
1095 | tmp |= BMCR_SPEED100; | 1095 | tmp |= BMCR_SPEED100; |
1096 | if (np->duplex == DUPLEX_FULL) | 1096 | if (np->duplex == DUPLEX_FULL) |
1097 | tmp |= BMCR_FULLDPLX; | 1097 | tmp |= BMCR_FULLDPLX; |
1098 | /* | 1098 | /* |
1099 | * Note: there is no good way to inform the link partner | 1099 | * Note: there is no good way to inform the link partner |
1100 | * that our capabilities changed. The user has to unplug | 1100 | * that our capabilities changed. The user has to unplug |
1101 | * and replug the network cable after some changes, e.g. | 1101 | * and replug the network cable after some changes, e.g. |
@@ -1236,7 +1236,7 @@ static int switch_port_internal(struct net_device *dev) | |||
1236 | writel(cfg, ioaddr + ChipConfig); | 1236 | writel(cfg, ioaddr + ChipConfig); |
1237 | readl(ioaddr + ChipConfig); | 1237 | readl(ioaddr + ChipConfig); |
1238 | udelay(1); | 1238 | udelay(1); |
1239 | 1239 | ||
1240 | /* 2) reset the internal phy: */ | 1240 | /* 2) reset the internal phy: */ |
1241 | bmcr = readw(ioaddr+BasicControl+(MII_BMCR<<2)); | 1241 | bmcr = readw(ioaddr+BasicControl+(MII_BMCR<<2)); |
1242 | writel(bmcr | BMCR_RESET, ioaddr+BasicControl+(MII_BMCR<<2)); | 1242 | writel(bmcr | BMCR_RESET, ioaddr+BasicControl+(MII_BMCR<<2)); |
@@ -1276,7 +1276,7 @@ static int find_mii(struct net_device *dev) | |||
1276 | 1276 | ||
1277 | /* Switch to external phy */ | 1277 | /* Switch to external phy */ |
1278 | did_switch = switch_port_external(dev); | 1278 | did_switch = switch_port_external(dev); |
1279 | 1279 | ||
1280 | /* Scan the possible phy addresses: | 1280 | /* Scan the possible phy addresses: |
1281 | * | 1281 | * |
1282 | * PHY address 0 means that the phy is in isolate mode. Not yet | 1282 | * PHY address 0 means that the phy is in isolate mode. Not yet |
@@ -1573,7 +1573,7 @@ static void check_link(struct net_device *dev) | |||
1573 | void __iomem * ioaddr = ns_ioaddr(dev); | 1573 | void __iomem * ioaddr = ns_ioaddr(dev); |
1574 | int duplex; | 1574 | int duplex; |
1575 | u16 bmsr; | 1575 | u16 bmsr; |
1576 | 1576 | ||
1577 | /* The link status field is latched: it remains low after a temporary | 1577 | /* The link status field is latched: it remains low after a temporary |
1578 | * link failure until it's read. We need the current link status, | 1578 | * link failure until it's read. We need the current link status, |
1579 | * thus read twice. | 1579 | * thus read twice. |
@@ -2096,7 +2096,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs | |||
2096 | 2096 | ||
2097 | if (np->hands_off) | 2097 | if (np->hands_off) |
2098 | return IRQ_NONE; | 2098 | return IRQ_NONE; |
2099 | 2099 | ||
2100 | /* Reading automatically acknowledges. */ | 2100 | /* Reading automatically acknowledges. */ |
2101 | np->intr_status = readl(ioaddr + IntrStatus); | 2101 | np->intr_status = readl(ioaddr + IntrStatus); |
2102 | 2102 | ||
@@ -2106,7 +2106,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs | |||
2106 | dev->name, np->intr_status, | 2106 | dev->name, np->intr_status, |
2107 | readl(ioaddr + IntrMask)); | 2107 | readl(ioaddr + IntrMask)); |
2108 | 2108 | ||
2109 | if (!np->intr_status) | 2109 | if (!np->intr_status) |
2110 | return IRQ_NONE; | 2110 | return IRQ_NONE; |
2111 | 2111 | ||
2112 | prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); | 2112 | prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); |
@@ -2141,13 +2141,13 @@ static int natsemi_poll(struct net_device *dev, int *budget) | |||
2141 | /* Abnormal error summary/uncommon events handlers. */ | 2141 | /* Abnormal error summary/uncommon events handlers. */ |
2142 | if (np->intr_status & IntrAbnormalSummary) | 2142 | if (np->intr_status & IntrAbnormalSummary) |
2143 | netdev_error(dev, np->intr_status); | 2143 | netdev_error(dev, np->intr_status); |
2144 | 2144 | ||
2145 | if (np->intr_status & | 2145 | if (np->intr_status & |
2146 | (IntrRxDone | IntrRxIntr | RxStatusFIFOOver | | 2146 | (IntrRxDone | IntrRxIntr | RxStatusFIFOOver | |
2147 | IntrRxErr | IntrRxOverrun)) { | 2147 | IntrRxErr | IntrRxOverrun)) { |
2148 | netdev_rx(dev, &work_done, work_to_do); | 2148 | netdev_rx(dev, &work_done, work_to_do); |
2149 | } | 2149 | } |
2150 | 2150 | ||
2151 | *budget -= work_done; | 2151 | *budget -= work_done; |
2152 | dev->quota -= work_done; | 2152 | dev->quota -= work_done; |
2153 | 2153 | ||
@@ -2744,7 +2744,7 @@ static int netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
2744 | * phy, even if the internal phy is used. This is necessary | 2744 | * phy, even if the internal phy is used. This is necessary |
2745 | * to work around a deficiency of the ethtool interface: | 2745 | * to work around a deficiency of the ethtool interface: |
2746 | * It's only possible to query the settings of the active | 2746 | * It's only possible to query the settings of the active |
2747 | * port. Therefore | 2747 | * port. Therefore |
2748 | * # ethtool -s ethX port mii | 2748 | * # ethtool -s ethX port mii |
2749 | * actually sends an ioctl to switch to port mii with the | 2749 | * actually sends an ioctl to switch to port mii with the |
2750 | * settings that are used for the current active port. | 2750 | * settings that are used for the current active port. |