1 --- a/drivers/net/ethernet/ar231x/ar231x.c
2 +++ b/drivers/net/ethernet/ar231x/ar231x.c
3 @@ -1291,7 +1291,7 @@ static int ar231x_mdiobus_probe (struct
5 BUG_ON(phydev->attached_dev);
7 - phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, 0,
8 + phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link,
9 PHY_INTERFACE_MODE_MII);
12 --- a/drivers/net/phy/mvswitch.c
13 +++ b/drivers/net/phy/mvswitch.c
14 @@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
18 - __vlan_hwaccel_put_tag(skb, vlan);
19 + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
23 --- a/drivers/net/phy/mvswitch.c
24 +++ b/drivers/net/phy/mvswitch.c
25 @@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
28 dev->priv_flags |= IFF_NO_IP_ALIGN;
29 - dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
30 + dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
32 - dev->features |= NETIF_F_HW_VLAN_RX;
33 + dev->features |= NETIF_F_HW_VLAN_CTAG_RX;