diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-05-23 16:36:06 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-05-23 16:36:06 -0400 |
commit | 76c224bc9fdf108ae6e97553322122f53bdbe75c (patch) | |
tree | 3901c34cf3ed64b7cf907917500a5317cf5467a6 /drivers/net/e1000/e1000_main.c | |
parent | a42a507cd3af14a2696b7c020996e48c10bf7742 (diff) |
e1000: remove leading and trailing whitespace.
Some leading and trailing whitespace made it into the driver code here.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index df819c1275a4..ccbe342198ad 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -349,7 +349,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter) | |||
349 | * For ASF and Pass Through versions of f/w this means that the | 349 | * For ASF and Pass Through versions of f/w this means that the |
350 | * driver is no longer loaded. For AMT version (only with 82573) i | 350 | * driver is no longer loaded. For AMT version (only with 82573) i |
351 | * of the f/w this means that the netowrk i/f is closed. | 351 | * of the f/w this means that the netowrk i/f is closed. |
352 | * | 352 | * |
353 | **/ | 353 | **/ |
354 | 354 | ||
355 | static void | 355 | static void |
@@ -381,10 +381,10 @@ e1000_release_hw_control(struct e1000_adapter *adapter) | |||
381 | * @adapter: address of board private structure | 381 | * @adapter: address of board private structure |
382 | * | 382 | * |
383 | * e1000_get_hw_control sets {CTRL_EXT|FWSM}:DRV_LOAD bit. | 383 | * e1000_get_hw_control sets {CTRL_EXT|FWSM}:DRV_LOAD bit. |
384 | * For ASF and Pass Through versions of f/w this means that | 384 | * For ASF and Pass Through versions of f/w this means that |
385 | * the driver is loaded. For AMT version (only with 82573) | 385 | * the driver is loaded. For AMT version (only with 82573) |
386 | * of the f/w this means that the netowrk i/f is open. | 386 | * of the f/w this means that the netowrk i/f is open. |
387 | * | 387 | * |
388 | **/ | 388 | **/ |
389 | 389 | ||
390 | static void | 390 | static void |
@@ -714,8 +714,8 @@ e1000_probe(struct pci_dev *pdev, | |||
714 | DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER session.\n"); | 714 | DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER session.\n"); |
715 | 715 | ||
716 | /* if ksp3, indicate if it's port a being setup */ | 716 | /* if ksp3, indicate if it's port a being setup */ |
717 | if (pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 && | 717 | if (pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 && |
718 | e1000_ksp3_port_a == 0) | 718 | e1000_ksp3_port_a == 0) |
719 | adapter->ksp3_port_a = 1; | 719 | adapter->ksp3_port_a = 1; |
720 | e1000_ksp3_port_a++; | 720 | e1000_ksp3_port_a++; |
721 | /* Reset for multiple KP3 adapters */ | 721 | /* Reset for multiple KP3 adapters */ |
@@ -743,9 +743,9 @@ e1000_probe(struct pci_dev *pdev, | |||
743 | if (pci_using_dac) | 743 | if (pci_using_dac) |
744 | netdev->features |= NETIF_F_HIGHDMA; | 744 | netdev->features |= NETIF_F_HIGHDMA; |
745 | 745 | ||
746 | /* hard_start_xmit is safe against parallel locking */ | 746 | /* hard_start_xmit is safe against parallel locking */ |
747 | netdev->features |= NETIF_F_LLTX; | 747 | netdev->features |= NETIF_F_LLTX; |
748 | 748 | ||
749 | adapter->en_mng_pt = e1000_enable_mng_pass_thru(&adapter->hw); | 749 | adapter->en_mng_pt = e1000_enable_mng_pass_thru(&adapter->hw); |
750 | 750 | ||
751 | /* before reading the EEPROM, reset the controller to | 751 | /* before reading the EEPROM, reset the controller to |
@@ -2773,7 +2773,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
2773 | unsigned int nr_frags = 0; | 2773 | unsigned int nr_frags = 0; |
2774 | unsigned int mss = 0; | 2774 | unsigned int mss = 0; |
2775 | int count = 0; | 2775 | int count = 0; |
2776 | int tso; | 2776 | int tso; |
2777 | unsigned int f; | 2777 | unsigned int f; |
2778 | len -= skb->data_len; | 2778 | len -= skb->data_len; |
2779 | 2779 | ||
@@ -2786,7 +2786,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
2786 | 2786 | ||
2787 | #ifdef NETIF_F_TSO | 2787 | #ifdef NETIF_F_TSO |
2788 | mss = skb_shinfo(skb)->tso_size; | 2788 | mss = skb_shinfo(skb)->tso_size; |
2789 | /* The controller does a simple calculation to | 2789 | /* The controller does a simple calculation to |
2790 | * make sure there is enough room in the FIFO before | 2790 | * make sure there is enough room in the FIFO before |
2791 | * initiating the DMA for each buffer. The calc is: | 2791 | * initiating the DMA for each buffer. The calc is: |
2792 | * 4 = ceil(buffer len/mss). To make sure we don't | 2792 | * 4 = ceil(buffer len/mss). To make sure we don't |
@@ -2809,7 +2809,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
2809 | case e1000_82573: | 2809 | case e1000_82573: |
2810 | pull_size = min((unsigned int)4, skb->data_len); | 2810 | pull_size = min((unsigned int)4, skb->data_len); |
2811 | if (!__pskb_pull_tail(skb, pull_size)) { | 2811 | if (!__pskb_pull_tail(skb, pull_size)) { |
2812 | printk(KERN_ERR | 2812 | printk(KERN_ERR |
2813 | "__pskb_pull_tail failed.\n"); | 2813 | "__pskb_pull_tail failed.\n"); |
2814 | dev_kfree_skb_any(skb); | 2814 | dev_kfree_skb_any(skb); |
2815 | return NETDEV_TX_OK; | 2815 | return NETDEV_TX_OK; |
@@ -3755,7 +3755,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, | |||
3755 | * throughput, so unsplit small packets and save the alloc/put*/ | 3755 | * throughput, so unsplit small packets and save the alloc/put*/ |
3756 | if (l1 && ((length + l1) <= adapter->rx_ps_bsize0)) { | 3756 | if (l1 && ((length + l1) <= adapter->rx_ps_bsize0)) { |
3757 | u8 *vaddr; | 3757 | u8 *vaddr; |
3758 | /* there is no documentation about how to call | 3758 | /* there is no documentation about how to call |
3759 | * kmap_atomic, so we can't hold the mapping | 3759 | * kmap_atomic, so we can't hold the mapping |
3760 | * very long */ | 3760 | * very long */ |
3761 | pci_dma_sync_single_for_cpu(pdev, | 3761 | pci_dma_sync_single_for_cpu(pdev, |