fm10k: whitespace cleanups
Subsystems (2)
PATCH 1/1 fm10k: whitespace cleanups
Signed-off-by Bruce Allan <[email protected]>
--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 1 - drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +0 -1
@@ -1020,7 +1020,6 @@ static int fm10k_set_priv_flags(struct net_device *netdev, u32 priv_flags)return 0 ; } -static u32 fm10k_get_reta_size (struct net_device __always_unused *netdev) {return FM10K_RETA_SIZE *FM10K_RETA_ENTRIES_PER_REG ;
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1 -1
@@ -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;int err; -if ((skb->protocol ==htons (ETH_P_8021Q )) && +if ((skb->protocol ==htons (ETH_P_8021Q )) && !skb_vlan_tag_present (skb)) {/* FM10K only supports hardware tagging, any tags in frame * are considered 2nd level or "outer" tags