ramips: switch DIR-615 H1 to new image build code

[librecmc/librecmc.git] / target / linux / ramips / patches-4.4 / 0509-net-next-mediatek-add-support-for-mt7621.patch

diff --git a/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch b/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch
index 401453904cc0c98fab0c7c04293feca4053f122c..6920545f0cc79d5d27344ae919b9f568064441dd 100644 (file)
--- a/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch
+++ b/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch
@@ -12,7 +12,7 @@ that get written to the switch and the internal phys. These values come
 straight from the SDK driver.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/soc_mt7621.c |  186 ++++++++++++++++++++++++++++
@@ -21,7 +21,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 
 --- /dev/null
 +++ b/drivers/net/ethernet/mediatek/soc_mt7621.c
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,185 @@
 +/*   This program is free software; you can redistribute it and/or modify
 + *   it under the terms of the GNU General Public License as published by
 + *   the Free Software Foundation; version 2 of the License
@@ -32,7 +32,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -146,8 +146,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 +
 +      /* mt7621 doesn't have txcsum config */
 +      mt7621_rxcsum_config((dev->features & NETIF_F_RXCSUM));
-+      mt7621_rxvlan_config((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
-+                           (priv->flags & FE_FLAG_RX_VLAN_CTAG));
++      mt7621_rxvlan_config(priv->flags & FE_FLAG_RX_VLAN_CTAG);
 +
 +      return 0;
 +}