diff options
author | Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> | 2018-10-26 14:44:46 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-11-20 14:39:04 -0500 |
commit | df17b7e02f0fa3a13c5aac26c317447d72612e1c (patch) | |
tree | db9599849635954ddeb1f1cea9b250180973a32f /drivers/net/ethernet/intel/ice/ice_main.c | |
parent | 2c5492de8770b72cb9c97c91fbcbb90c16470819 (diff) |
ice: Cosmetic formatting changes
1. Fix several cases of double spacing
2. Fix typos
3. Capitalize abbreviations
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 54ded5d9ab4f..9f85d6534520 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c | |||
@@ -408,7 +408,7 @@ static void ice_reset_subtask(struct ice_pf *pf) | |||
408 | /* When a CORER/GLOBR/EMPR is about to happen, the hardware triggers an | 408 | /* When a CORER/GLOBR/EMPR is about to happen, the hardware triggers an |
409 | * OICR interrupt. The OICR handler (ice_misc_intr) determines what type | 409 | * OICR interrupt. The OICR handler (ice_misc_intr) determines what type |
410 | * of reset is pending and sets bits in pf->state indicating the reset | 410 | * of reset is pending and sets bits in pf->state indicating the reset |
411 | * type and __ICE_RESET_OICR_RECV. So, if the latter bit is set | 411 | * type and __ICE_RESET_OICR_RECV. So, if the latter bit is set |
412 | * prepare for pending reset if not already (for PF software-initiated | 412 | * prepare for pending reset if not already (for PF software-initiated |
413 | * global resets the software should already be prepared for it as | 413 | * global resets the software should already be prepared for it as |
414 | * indicated by __ICE_PREPARED_FOR_RESET; for global resets initiated | 414 | * indicated by __ICE_PREPARED_FOR_RESET; for global resets initiated |
@@ -1382,7 +1382,7 @@ static void ice_free_irq_msix_misc(struct ice_pf *pf) | |||
1382 | * @pf: board private structure | 1382 | * @pf: board private structure |
1383 | * | 1383 | * |
1384 | * This sets up the handler for MSIX 0, which is used to manage the | 1384 | * This sets up the handler for MSIX 0, which is used to manage the |
1385 | * non-queue interrupts, e.g. AdminQ and errors. This is not used | 1385 | * non-queue interrupts, e.g. AdminQ and errors. This is not used |
1386 | * when in MSI or Legacy interrupt mode. | 1386 | * when in MSI or Legacy interrupt mode. |
1387 | */ | 1387 | */ |
1388 | static int ice_req_irq_msix_misc(struct ice_pf *pf) | 1388 | static int ice_req_irq_msix_misc(struct ice_pf *pf) |
@@ -3674,7 +3674,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, | |||
3674 | */ | 3674 | */ |
3675 | status = ice_update_sw_rule_bridge_mode(hw); | 3675 | status = ice_update_sw_rule_bridge_mode(hw); |
3676 | if (status) { | 3676 | if (status) { |
3677 | netdev_err(dev, "update SW_RULE for bridge mode failed, = %d err %d aq_err %d\n", | 3677 | netdev_err(dev, "switch rule update failed, mode = %d err %d aq_err %d\n", |
3678 | mode, status, hw->adminq.sq_last_status); | 3678 | mode, status, hw->adminq.sq_last_status); |
3679 | /* revert hw->evb_veb */ | 3679 | /* revert hw->evb_veb */ |
3680 | hw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB); | 3680 | hw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB); |
@@ -3785,7 +3785,7 @@ static void ice_tx_timeout(struct net_device *netdev) | |||
3785 | * @netdev: network interface device structure | 3785 | * @netdev: network interface device structure |
3786 | * | 3786 | * |
3787 | * The open entry point is called when a network interface is made | 3787 | * The open entry point is called when a network interface is made |
3788 | * active by the system (IFF_UP). At this point all resources needed | 3788 | * active by the system (IFF_UP). At this point all resources needed |
3789 | * for transmit and receive operations are allocated, the interrupt | 3789 | * for transmit and receive operations are allocated, the interrupt |
3790 | * handler is registered with the OS, the netdev watchdog is enabled, | 3790 | * handler is registered with the OS, the netdev watchdog is enabled, |
3791 | * and the stack is notified that the interface is ready. | 3791 | * and the stack is notified that the interface is ready. |
@@ -3818,7 +3818,7 @@ static int ice_open(struct net_device *netdev) | |||
3818 | * @netdev: network interface device structure | 3818 | * @netdev: network interface device structure |
3819 | * | 3819 | * |
3820 | * The stop entry point is called when an interface is de-activated by the OS, | 3820 | * The stop entry point is called when an interface is de-activated by the OS, |
3821 | * and the netdevice enters the DOWN state. The hardware is still under the | 3821 | * and the netdevice enters the DOWN state. The hardware is still under the |
3822 | * driver's control, but the netdev interface is disabled. | 3822 | * driver's control, but the netdev interface is disabled. |
3823 | * | 3823 | * |
3824 | * Returns success only - not allowed to fail | 3824 | * Returns success only - not allowed to fail |
@@ -3847,14 +3847,14 @@ ice_features_check(struct sk_buff *skb, | |||
3847 | size_t len; | 3847 | size_t len; |
3848 | 3848 | ||
3849 | /* No point in doing any of this if neither checksum nor GSO are | 3849 | /* No point in doing any of this if neither checksum nor GSO are |
3850 | * being requested for this frame. We can rule out both by just | 3850 | * being requested for this frame. We can rule out both by just |
3851 | * checking for CHECKSUM_PARTIAL | 3851 | * checking for CHECKSUM_PARTIAL |
3852 | */ | 3852 | */ |
3853 | if (skb->ip_summed != CHECKSUM_PARTIAL) | 3853 | if (skb->ip_summed != CHECKSUM_PARTIAL) |
3854 | return features; | 3854 | return features; |
3855 | 3855 | ||
3856 | /* We cannot support GSO if the MSS is going to be less than | 3856 | /* We cannot support GSO if the MSS is going to be less than |
3857 | * 64 bytes. If it is then we need to drop support for GSO. | 3857 | * 64 bytes. If it is then we need to drop support for GSO. |
3858 | */ | 3858 | */ |
3859 | if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_size < 64)) | 3859 | if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_size < 64)) |
3860 | features &= ~NETIF_F_GSO_MASK; | 3860 | features &= ~NETIF_F_GSO_MASK; |