diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e100.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 9d42dd8f402e..36ba6dc96acc 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -94,7 +94,7 @@ | |||
94 | * enabled. 82557 pads with 7Eh, while the later controllers pad | 94 | * enabled. 82557 pads with 7Eh, while the later controllers pad |
95 | * with 00h. | 95 | * with 00h. |
96 | * | 96 | * |
97 | * IV. Recieve | 97 | * IV. Receive |
98 | * | 98 | * |
99 | * The Receive Frame Area (RFA) comprises a ring of Receive Frame | 99 | * The Receive Frame Area (RFA) comprises a ring of Receive Frame |
100 | * Descriptors (RFD) + data buffer, thus forming the simplified mode | 100 | * Descriptors (RFD) + data buffer, thus forming the simplified mode |
@@ -120,7 +120,7 @@ | |||
120 | * and Rx indication and re-allocation happen in the same context, | 120 | * and Rx indication and re-allocation happen in the same context, |
121 | * therefore no locking is required. A software-generated interrupt | 121 | * therefore no locking is required. A software-generated interrupt |
122 | * is generated from the watchdog to recover from a failed allocation | 122 | * is generated from the watchdog to recover from a failed allocation |
123 | * senario where all Rx resources have been indicated and none re- | 123 | * scenario where all Rx resources have been indicated and none re- |
124 | * placed. | 124 | * placed. |
125 | * | 125 | * |
126 | * V. Miscellaneous | 126 | * V. Miscellaneous |
@@ -954,7 +954,7 @@ static void e100_get_defaults(struct nic *nic) | |||
954 | /* Quadwords to DMA into FIFO before starting frame transmit */ | 954 | /* Quadwords to DMA into FIFO before starting frame transmit */ |
955 | nic->tx_threshold = 0xE0; | 955 | nic->tx_threshold = 0xE0; |
956 | 956 | ||
957 | /* no interrupt for every tx completion, delay = 256us if not 557*/ | 957 | /* no interrupt for every tx completion, delay = 256us if not 557 */ |
958 | nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf | | 958 | nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf | |
959 | ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i)); | 959 | ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i)); |
960 | 960 | ||
@@ -1497,7 +1497,7 @@ static void e100_update_stats(struct nic *nic) | |||
1497 | &s->complete; | 1497 | &s->complete; |
1498 | 1498 | ||
1499 | /* Device's stats reporting may take several microseconds to | 1499 | /* Device's stats reporting may take several microseconds to |
1500 | * complete, so where always waiting for results of the | 1500 | * complete, so we're always waiting for results of the |
1501 | * previous command. */ | 1501 | * previous command. */ |
1502 | 1502 | ||
1503 | if(*complete == cpu_to_le32(cuc_dump_reset_complete)) { | 1503 | if(*complete == cpu_to_le32(cuc_dump_reset_complete)) { |
@@ -2858,17 +2858,17 @@ static void e100_shutdown(struct pci_dev *pdev) | |||
2858 | /** | 2858 | /** |
2859 | * e100_io_error_detected - called when PCI error is detected. | 2859 | * e100_io_error_detected - called when PCI error is detected. |
2860 | * @pdev: Pointer to PCI device | 2860 | * @pdev: Pointer to PCI device |
2861 | * @state: The current pci conneection state | 2861 | * @state: The current pci connection state |
2862 | */ | 2862 | */ |
2863 | static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) | 2863 | static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) |
2864 | { | 2864 | { |
2865 | struct net_device *netdev = pci_get_drvdata(pdev); | 2865 | struct net_device *netdev = pci_get_drvdata(pdev); |
2866 | struct nic *nic = netdev_priv(netdev); | 2866 | struct nic *nic = netdev_priv(netdev); |
2867 | 2867 | ||
2868 | /* Similar to calling e100_down(), but avoids adpater I/O. */ | 2868 | /* Similar to calling e100_down(), but avoids adapter I/O. */ |
2869 | netdev->stop(netdev); | 2869 | netdev->stop(netdev); |
2870 | 2870 | ||
2871 | /* Detach; put netif into state similar to hotplug unplug. */ | 2871 | /* Detach; put netif into a state similar to hotplug unplug. */ |
2872 | napi_enable(&nic->napi); | 2872 | napi_enable(&nic->napi); |
2873 | netif_device_detach(netdev); | 2873 | netif_device_detach(netdev); |
2874 | pci_disable_device(pdev); | 2874 | pci_disable_device(pdev); |