leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fm10k: whitespace cleanups

Browse Source 
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Bruce Allan
2015-10-28 17:19:40 -07:00
committed by Jeff Kirsher
parent e214d85b4a
commit a4fcad656e
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
View File

@@ -127,7 +127,7 @@ static const struct fm10k_stats fm10k_gstrings_mbx_stats[] = {
#define FM10K_MBX_STATS_LEN ARRAY_SIZE(fm10k_gstrings_mbx_stats) #define FM10K_MBX_STATS_LEN ARRAY_SIZE(fm10k_gstrings_mbx_stats)
#define FM10K_QUEUE_STATS_LEN(_n) \ #define FM10K_QUEUE_STATS_LEN(_n) \
( (_n) * 2 * (sizeof(struct fm10k_queue_stats) / sizeof(u64))) ((_n) * 2 * (sizeof(struct fm10k_queue_stats) / sizeof(u64)))
#define FM10K_STATIC_STATS_LEN (FM10K_GLOBAL_STATS_LEN + \ #define FM10K_STATIC_STATS_LEN (FM10K_GLOBAL_STATS_LEN + \
FM10K_NETDEV_STATS_LEN + \ FM10K_NETDEV_STATS_LEN + \
@@ -322,6 +322,7 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,
if ((interface->flags & FM10K_FLAG_DEBUG_STATS) && iov_data) { if ((interface->flags & FM10K_FLAG_DEBUG_STATS) && iov_data) {
for (i = 0; i < iov_data->num_vfs; i++) { for (i = 0; i < iov_data->num_vfs; i++) {
struct fm10k_vf_info *vf_info; struct fm10k_vf_info *vf_info;
vf_info = &iov_data->vf_info[i]; vf_info = &iov_data->vf_info[i];
/* skip stats if we don't have a vf info */ /* skip stats if we don't have a vf info */
@@ -1020,7 +1021,6 @@ static int fm10k_set_priv_flags(struct net_device *netdev, u32 priv_flags)
return 0; return 0;
} }
static u32 fm10k_get_reta_size(struct net_device __always_unused *netdev) static u32 fm10k_get_reta_size(struct net_device __always_unused *netdev)
{ {
return FM10K_RETA_SIZE * FM10K_RETA_ENTRIES_PER_REG; return FM10K_RETA_SIZE * FM10K_RETA_ENTRIES_PER_REG;

4
drivers/net/ethernet/intel/fm10k/fm10k_main.c
View File

@@ -917,7 +917,7 @@ static u8 fm10k_tx_desc_flags(struct sk_buff *skb, u32 tx_flags)
/* set timestamping bits */ /* set timestamping bits */
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) && if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
likely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) likely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS))
desc_flags |= FM10K_TXD_FLAG_TIME; desc_flags |= FM10K_TXD_FLAG_TIME;
/* set checksum offload bits */ /* set checksum offload bits */
desc_flags |= FM10K_SET_FLAG(tx_flags, FM10K_TX_FLAGS_CSUM, desc_flags |= FM10K_SET_FLAG(tx_flags, FM10K_TX_FLAGS_CSUM,
@@ -1462,7 +1462,7 @@ static int fm10k_poll(struct napi_struct *napi, int budget)
* allow the budget to go below 1 because we'll exit polling * allow the budget to go below 1 because we'll exit polling
*/ */
if (q_vector->rx.count > 1) if (q_vector->rx.count > 1)
per_ring_budget = max(budget/q_vector->rx.count, 1); per_ring_budget = max(budget / q_vector->rx.count, 1);
else else
per_ring_budget = budget; per_ring_budget = budget;

1
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
View File

@@ -2140,6 +2140,7 @@ s32 fm10k_sm_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx,
{ {
mbx->mbx_reg = FM10K_GMBX; mbx->mbx_reg = FM10K_GMBX;
mbx->mbmem_reg = FM10K_MBMEM_PF(0); mbx->mbmem_reg = FM10K_MBMEM_PF(0);
/* start out in closed state */ /* start out in closed state */
mbx->state = FM10K_STATE_CLOSED; mbx->state = FM10K_STATE_CLOSED;

4
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
View File

@@ -608,7 +608,7 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)
unsigned int r_idx = skb->queue_mapping; unsigned int r_idx = skb->queue_mapping;
int err; int err;
if ((skb->protocol == htons(ETH_P_8021Q)) && if ((skb->protocol == htons(ETH_P_8021Q)) &&
!skb_vlan_tag_present(skb)) { !skb_vlan_tag_present(skb)) {
/* FM10K only supports hardware tagging, any tags in frame /* FM10K only supports hardware tagging, any tags in frame
* are considered 2nd level or "outer" tags * are considered 2nd level or "outer" tags
@@ -705,7 +705,7 @@ static void fm10k_tx_timeout(struct net_device *netdev)
} else { } else {
netif_info(interface, drv, netdev, netif_info(interface, drv, netdev,
"Fake Tx hang detected with timeout of %d seconds\n", "Fake Tx hang detected with timeout of %d seconds\n",
netdev->watchdog_timeo/HZ); netdev->watchdog_timeo / HZ);
/* fake Tx hang - increase the kernel timeout */ /* fake Tx hang - increase the kernel timeout */
if (netdev->watchdog_timeo < TX_TIMEO_LIMIT) if (netdev->watchdog_timeo < TX_TIMEO_LIMIT)

5
drivers/net/ethernet/intel/fm10k/fm10k_pci.c
View File

@@ -919,7 +919,7 @@ void fm10k_netpoll(struct net_device *netdev)
#endif #endif
#define FM10K_ERR_MSG(type) case (type): error = #type; break #define FM10K_ERR_MSG(type) case (type): error = #type; break
static void fm10k_handle_fault(struct fm10k_intfc *interface, int type, static void fm10k_handle_fault(struct fm10k_intfc *interface, int type,
struct fm10k_fault *fault) struct fm10k_fault *fault)
{ {
struct pci_dev *pdev = interface->pdev; struct pci_dev *pdev = interface->pdev;
struct fm10k_hw *hw = &interface->hw; struct fm10k_hw *hw = &interface->hw;
@@ -1890,8 +1890,7 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface)
* The OS initialization, configuring of the interface private structure, * The OS initialization, configuring of the interface private structure,
* and a hardware reset occur. * and a hardware reset occur.
**/ **/
static int fm10k_probe(struct pci_dev *pdev, static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct net_device *netdev; struct net_device *netdev;
struct fm10k_intfc *interface; struct fm10k_intfc *interface;

1
drivers/net/ethernet/intel/fm10k/fm10k_pf.c
View File

@@ -414,6 +414,7 @@ static s32 fm10k_update_xcast_mode_pf(struct fm10k_hw *hw, u16 glort, u8 mode)
if (mode > FM10K_XCAST_MODE_NONE) if (mode > FM10K_XCAST_MODE_NONE)
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* if glort is not valid return error */ /* if glort is not valid return error */
if (!fm10k_glort_valid_pf(hw, glort)) if (!fm10k_glort_valid_pf(hw, glort))
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;

1
drivers/net/ethernet/intel/fm10k/fm10k_vf.c
View File

@@ -442,6 +442,7 @@ static s32 fm10k_update_xcast_mode_vf(struct fm10k_hw *hw, u16 glort, u8 mode)
if (mode > FM10K_XCAST_MODE_NONE) if (mode > FM10K_XCAST_MODE_NONE)
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* generate message requesting to change xcast mode */ /* generate message requesting to change xcast mode */
fm10k_tlv_msg_init(msg, FM10K_VF_MSG_ID_LPORT_STATE); fm10k_tlv_msg_init(msg, FM10K_VF_MSG_ID_LPORT_STATE);
fm10k_tlv_attr_put_u8(msg, FM10K_LPORT_STATE_MSG_XCAST_MODE, mode); fm10k_tlv_attr_put_u8(msg, FM10K_LPORT_STATE_MSG_XCAST_MODE, mode);