diff options
Diffstat (limited to 'drivers/net/ethernet/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-selftest.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c index 12770af031eb..c56587384d57 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c @@ -1202,10 +1202,7 @@ static int __xgbe_phy_config_aneg(struct xgbe_prv_data *pdata, bool set_mode) xgbe_an_restart(pdata); out: - if (ret) - set_bit(XGBE_LINK_ERR, &pdata->dev_state); - else - clear_bit(XGBE_LINK_ERR, &pdata->dev_state); + assign_bit(XGBE_LINK_ERR, &pdata->dev_state, ret); mutex_unlock(&pdata->an_mutex); diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c b/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c index cfdbd4639a1e..7ebae08ddf29 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c @@ -44,7 +44,7 @@ static int xgbe_test_loopback_validate(struct sk_buff *skb, struct iphdr *ih; int eat; - skb = skb_unshare(skb, GFP_ATOMIC); + skb = skb_unclone_full(skb, GFP_ATOMIC); if (!skb) goto out; |