3 files changed, 17 insertions, 9 deletions

diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index a90080f12e67..e548c0ae2e00 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -666,7 +666,7 @@ static int amd8111e_tx(struct net_device *dev)
                         pci_unmap_single(lp->pci_dev, lp->tx_dma_addr[tx_index],
                                         lp->tx_skbuff[tx_index]->len,
                                         PCI_DMA_TODEVICE);
-                        dev_kfree_skb_irq (lp->tx_skbuff[tx_index]);
+                        dev_consume_skb_irq(lp->tx_skbuff[tx_index]);
                         lp->tx_skbuff[tx_index] = NULL;
                         lp->tx_dma_addr[tx_index] = 0;
                 }
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
index d272dc6984ac..b40d4377cc71 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
@@ -431,8 +431,6 @@
 #define MAC_MDIOSCAR_PA_WIDTH           5
 #define MAC_MDIOSCAR_RA_INDEX           0
 #define MAC_MDIOSCAR_RA_WIDTH           16
-#define MAC_MDIOSCAR_REG_INDEX          0
-#define MAC_MDIOSCAR_REG_WIDTH          21
 #define MAC_MDIOSCCDR_BUSY_INDEX        22
 #define MAC_MDIOSCCDR_BUSY_WIDTH        1
 #define MAC_MDIOSCCDR_CMD_INDEX         16
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 1e929a1e4ca7..4666084eda16 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1284,6 +1284,20 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
         }
 }
 
+static unsigned int xgbe_create_mdio_sca(int port, int reg)
+{
+        unsigned int mdio_sca, da;
+
+        da = (reg & MII_ADDR_C45) ? reg >> 16 : 0;
+
+        mdio_sca = 0;
+        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, RA, reg);
+        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, PA, port);
+        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, DA, da);
+
+        return mdio_sca;
+}
+
 static int xgbe_write_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,
                                    int reg, u16 val)
 {
@@ -1291,9 +1305,7 @@ static int xgbe_write_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,
 
         reinit_completion(&pdata->mdio_complete);
 
-        mdio_sca = 0;
-        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, REG, reg);
-        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, DA, addr);
+        mdio_sca = xgbe_create_mdio_sca(addr, reg);
         XGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca);
 
         mdio_sccd = 0;
@@ -1317,9 +1329,7 @@ static int xgbe_read_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,
 
         reinit_completion(&pdata->mdio_complete);
 
-        mdio_sca = 0;
-        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, REG, reg);
-        XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, DA, addr);
+        mdio_sca = xgbe_create_mdio_sca(addr, reg);
         XGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca);
 
         mdio_sccd = 0;