target/linux/atheros/patches-3.10/230-3_10-updates.patch

   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
   4         BUG_ON(!phydev);
   5         BUG_ON(phydev->attached_dev);
   6
   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);
  10
  11         if (IS_ERR(phydev)) {
  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
  15         if (vlan == -1)
  16                 return;
  17
  18 -       __vlan_hwaccel_put_tag(skb, vlan);
  19 +       __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
  20  }
  21
  22
  23 @@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
  24
  25  #ifdef HEADER_MODE
  26         dev->priv_flags |= IFF_NO_IP_ALIGN;
  27 -       dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
  28 +       dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
  29  #else
  30 -       dev->features |= NETIF_F_HW_VLAN_RX;
  31 +       dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
  32  #endif
  33
  34         return 0;