amd-xgbe: Checkpatch fixes

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / amd / xgbe / xgbe-drv.c

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 7bb5f07dbeef3e806174047cc883e3fb6ca149c3..e2e921768185476795e407bf23d766a1a2edd2b7 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -692,7 +692,7 @@ static void xgbe_adjust_link(struct net_device *netdev)
        struct phy_device *phydev = pdata->phydev;
        int new_state = 0;
 
-       if (phydev == NULL)
+       if (!phydev)
                return;
 
        if (phydev->link) {
@@ -1165,8 +1165,8 @@ static void xgbe_prep_tx_tstamp(struct xgbe_prv_data *pdata,
 
 static void xgbe_prep_vlan(struct sk_buff *skb, struct xgbe_packet_data *packet)
 {
-       if (vlan_tx_tag_present(skb))
-               packet->vlan_ctag = vlan_tx_tag_get(skb);
+       if (skb_vlan_tag_present(skb))
+               packet->vlan_ctag = skb_vlan_tag_get(skb);
 }
 
 static int xgbe_prep_tso(struct sk_buff *skb, struct xgbe_packet_data *packet)
@@ -1247,9 +1247,9 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
                XGMAC_SET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
                               CSUM_ENABLE, 1);
 
-       if (vlan_tx_tag_present(skb)) {
+       if (skb_vlan_tag_present(skb)) {
                /* VLAN requires an extra descriptor if tag is different */
-               if (vlan_tx_tag_get(skb) != ring->tx.cur_vlan_ctag)
+               if (skb_vlan_tag_get(skb) != ring->tx.cur_vlan_ctag)
                        /* We can share with the TSO context descriptor */
                        if (!context_desc) {
                                context_desc = 1;