diff options
| author | John Crispin <john@openwrt.org> | 2013-07-22 19:10:59 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-07-22 19:10:59 +0000 |
| commit | 9181c569c45f1acc214fc8be6d45ddf8f68955ef (patch) | |
| tree | 91fa6f14654a60f44f73f96838ecdf8001e91dad /target/linux/atheros/patches-3.10/230-3_10-updates.patch | |
| parent | db32da6b1628add30bff2dbf3ccc39ab9fcb26a9 (diff) | |
| download | upstream-9181c569c45f1acc214fc8be6d45ddf8f68955ef.tar.gz upstream-9181c569c45f1acc214fc8be6d45ddf8f68955ef.tar.bz2 upstream-9181c569c45f1acc214fc8be6d45ddf8f68955ef.zip | |
linux/atheros: add 3.10 kernel support
SVN-Revision: 37513
Diffstat (limited to 'target/linux/atheros/patches-3.10/230-3_10-updates.patch')
| -rw-r--r-- | target/linux/atheros/patches-3.10/230-3_10-updates.patch | 36 |
1 files changed, 36 insertions, 0 deletions
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 new file mode 100644 index 0000000000..73461eaf1c --- /dev/null +++ b/target/linux/atheros/patches-3.10/230-3_10-updates.patch @@ -0,0 +1,36 @@ +--- a/drivers/net/ethernet/ar231x/ar231x.c ++++ b/drivers/net/ethernet/ar231x/ar231x.c +@@ -1291,7 +1291,7 @@ static int ar231x_mdiobus_probe (struct + BUG_ON(!phydev); + BUG_ON(phydev->attached_dev); + +- phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, 0, ++ phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, + 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; |