atheros: do not assignment in if condition

[openwrt/staging/chunkeey.git] / target / linux / atheros / patches-3.10 / 230-3_10-updates.patch

diff --git a/target/linux/atheros/patches-3.10/230-3_10-updates.patch b/target/linux/atheros/patches-3.10/230-3_10-updates.patch
index 73461eaf1c731c604214b7e6f1437fd6bdcbc624..80d7eaa3956d97b1ac2a5179436a90f3eec8367b 100644 (file)
--- a/target/linux/atheros/patches-3.10/230-3_10-updates.patch
+++ b/target/linux/atheros/patches-3.10/230-3_10-updates.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/ar231x/ar231x.c
 +++ b/drivers/net/ethernet/ar231x/ar231x.c
-@@ -1291,7 +1291,7 @@ static int ar231x_mdiobus_probe (struct
+@@ -1283,7 +1283,7 @@ static int ar231x_mdiobus_probe (struct
        BUG_ON(!phydev);
        BUG_ON(phydev->attached_dev);
  
@@ -9,28 +9,3 @@
                PHY_INTERFACE_MODE_MII);
  
        if (IS_ERR(phydev)) {
---- a/drivers/net/phy/mvswitch.c
-+++ b/drivers/net/phy/mvswitch.c
-@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
-       if (vlan == -1)
-               return;
- 
--      __vlan_hwaccel_put_tag(skb, vlan);
-+      __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
- }
- 
- 
---- a/drivers/net/phy/mvswitch.c
-+++ b/drivers/net/phy/mvswitch.c
-@@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
- 
- #ifdef HEADER_MODE
-       dev->priv_flags |= IFF_NO_IP_ALIGN;
--      dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
-+      dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
- #else
--      dev->features |= NETIF_F_HW_VLAN_RX;
-+      dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
- #endif
- 
-       return 0;