diff options
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 3d850af0cdda..0dfd1b93829e 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -200,7 +200,7 @@ static struct pci_driver igb_driver = { | |||
200 | .probe = igb_probe, | 200 | .probe = igb_probe, |
201 | .remove = __devexit_p(igb_remove), | 201 | .remove = __devexit_p(igb_remove), |
202 | #ifdef CONFIG_PM | 202 | #ifdef CONFIG_PM |
203 | /* Power Managment Hooks */ | 203 | /* Power Management Hooks */ |
204 | .suspend = igb_suspend, | 204 | .suspend = igb_suspend, |
205 | .resume = igb_resume, | 205 | .resume = igb_resume, |
206 | #endif | 206 | #endif |
@@ -2292,7 +2292,7 @@ static void igb_init_hw_timer(struct igb_adapter *adapter) | |||
2292 | /** | 2292 | /** |
2293 | * Scale the NIC clock cycle by a large factor so that | 2293 | * Scale the NIC clock cycle by a large factor so that |
2294 | * relatively small clock corrections can be added or | 2294 | * relatively small clock corrections can be added or |
2295 | * substracted at each clock tick. The drawbacks of a large | 2295 | * subtracted at each clock tick. The drawbacks of a large |
2296 | * factor are a) that the clock register overflows more quickly | 2296 | * factor are a) that the clock register overflows more quickly |
2297 | * (not such a big deal) and b) that the increment per tick has | 2297 | * (not such a big deal) and b) that the increment per tick has |
2298 | * to fit into 24 bits. As a result we need to use a shift of | 2298 | * to fit into 24 bits. As a result we need to use a shift of |
@@ -3409,7 +3409,7 @@ static void igb_set_rx_mode(struct net_device *netdev) | |||
3409 | } else { | 3409 | } else { |
3410 | /* | 3410 | /* |
3411 | * Write addresses to the MTA, if the attempt fails | 3411 | * Write addresses to the MTA, if the attempt fails |
3412 | * then we should just turn on promiscous mode so | 3412 | * then we should just turn on promiscuous mode so |
3413 | * that we can at least receive multicast traffic | 3413 | * that we can at least receive multicast traffic |
3414 | */ | 3414 | */ |
3415 | count = igb_write_mc_addr_list(netdev); | 3415 | count = igb_write_mc_addr_list(netdev); |
@@ -3423,7 +3423,7 @@ static void igb_set_rx_mode(struct net_device *netdev) | |||
3423 | /* | 3423 | /* |
3424 | * Write addresses to available RAR registers, if there is not | 3424 | * Write addresses to available RAR registers, if there is not |
3425 | * sufficient space to store all the addresses then enable | 3425 | * sufficient space to store all the addresses then enable |
3426 | * unicast promiscous mode | 3426 | * unicast promiscuous mode |
3427 | */ | 3427 | */ |
3428 | count = igb_write_uc_addr_list(netdev); | 3428 | count = igb_write_uc_addr_list(netdev); |
3429 | if (count < 0) { | 3429 | if (count < 0) { |
@@ -4317,7 +4317,7 @@ netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb, | |||
4317 | 4317 | ||
4318 | /* | 4318 | /* |
4319 | * count reflects descriptors mapped, if 0 or less then mapping error | 4319 | * count reflects descriptors mapped, if 0 or less then mapping error |
4320 | * has occured and we need to rewind the descriptor queue | 4320 | * has occurred and we need to rewind the descriptor queue |
4321 | */ | 4321 | */ |
4322 | count = igb_tx_map_adv(tx_ring, skb, first); | 4322 | count = igb_tx_map_adv(tx_ring, skb, first); |
4323 | if (!count) { | 4323 | if (!count) { |
@@ -5352,8 +5352,8 @@ static void igb_msg_task(struct igb_adapter *adapter) | |||
5352 | * The unicast table address is a register array of 32-bit registers. | 5352 | * The unicast table address is a register array of 32-bit registers. |
5353 | * The table is meant to be used in a way similar to how the MTA is used | 5353 | * The table is meant to be used in a way similar to how the MTA is used |
5354 | * however due to certain limitations in the hardware it is necessary to | 5354 | * however due to certain limitations in the hardware it is necessary to |
5355 | * set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscous | 5355 | * set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous |
5356 | * enable bit to allow vlan tag stripping when promiscous mode is enabled | 5356 | * enable bit to allow vlan tag stripping when promiscuous mode is enabled |
5357 | **/ | 5357 | **/ |
5358 | static void igb_set_uta(struct igb_adapter *adapter) | 5358 | static void igb_set_uta(struct igb_adapter *adapter) |
5359 | { | 5359 | { |