From a1e018308cad8a4904913f915faca780d7410495 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 16 Mar 2015 10:58:43 +0000 Subject: [PATCH] netlogic: bump to 3.18 Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44829 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/netlogic/Makefile | 2 +- .../netlogic/patches-3.14/001-modular_usb.patch | 13 ----- .../netlogic/patches-3.14/002-xlr_net_fix.patch | 63 ---------------------- 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 target/linux/netlogic/patches-3.14/001-modular_usb.patch delete mode 100644 target/linux/netlogic/patches-3.14/002-xlr_net_fix.patch diff --git a/target/linux/netlogic/Makefile b/target/linux/netlogic/Makefile index 4646830843..5e15fff390 100644 --- a/target/linux/netlogic/Makefile +++ b/target/linux/netlogic/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 pci usb MAINTAINER:=Florian Fainelli SUBTARGETS:=xlp xlr -KERNEL_PATCHVER:=3.14 +KERNEL_PATCHVER:=3.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/netlogic/patches-3.14/001-modular_usb.patch b/target/linux/netlogic/patches-3.14/001-modular_usb.patch deleted file mode 100644 index c6c647393d..0000000000 --- a/target/linux/netlogic/patches-3.14/001-modular_usb.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: linux-3.14.16/arch/mips/netlogic/xlp/Makefile -=================================================================== ---- linux-3.14.16.orig/arch/mips/netlogic/xlp/Makefile 2014-08-07 16:50:59.000000000 -0700 -+++ linux-3.14.16/arch/mips/netlogic/xlp/Makefile 2014-09-25 12:12:29.853539866 -0700 -@@ -1,4 +1,6 @@ - obj-y += setup.o nlm_hal.o cop2-ex.o dt.o - obj-$(CONFIG_SMP) += wakeup.o --obj-$(CONFIG_USB) += usb-init.o --obj-$(CONFIG_USB) += usb-init-xlp2.o -+ifdef CONFIG_USB -+obj-y += usb-init.o -+obj-y += usb-init-xlp2.o -+endif diff --git a/target/linux/netlogic/patches-3.14/002-xlr_net_fix.patch b/target/linux/netlogic/patches-3.14/002-xlr_net_fix.patch deleted file mode 100644 index 0210f24bab..0000000000 --- a/target/linux/netlogic/patches-3.14/002-xlr_net_fix.patch +++ /dev/null @@ -1,63 +0,0 @@ -Subject: [PATCH] staging: xlr_net: Replace obsolete nlm_cop2_{enable,restore} macros - -Commit 64f6ebe63914 ("MIPS: Netlogic: rename nlm_cop2_save/restore") -replaced nlm_cop2_enable with nlm_cop2_enable_irqsave and -nlm_cop2_restore with nlm_cop2_disable_irqrestore but it did not -update the xlr_net driver to use the new macros resulting into build -problems like this: - -drivers/staging/netlogic/xlr_net.c: In function 'send_to_rfr_fifo': -drivers/staging/netlogic/xlr_net.c:128:3: error: implicit declaration of -function 'nlm_cop2_enable' [-Werror=implicit-function-declaration] -mflags = nlm_cop2_enable(); -^ -drivers/staging/netlogic/xlr_net.c:130:3: error: implicit declaration of -function 'nlm_cop2_restore' [-Werror=implicit-function-declaration] -nlm_cop2_restore(mflags); - -Therefore rename these cases as well - -Cc: Greg Kroah-Hartman -Cc: "David S. Miller" -Cc: devel@driverdev.osuosl.org -Cc: linux-kernel@vger.kernel.org -Cc: Jayachandran C -Cc: netdev@vger.kernel.org -Signed-off-by: Markos Chandras ---- - drivers/staging/netlogic/xlr_net.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c -index 9bf407d6241a..469f75f0f818 100644 ---- a/drivers/staging/netlogic/xlr_net.c -+++ b/drivers/staging/netlogic/xlr_net.c -@@ -125,9 +125,9 @@ static int send_to_rfr_fifo(struct xlr_net_priv *priv, void *addr) - msg.msg3 = 0; - stnid = priv->nd->rfr_station; - do { -- mflags = nlm_cop2_enable(); -+ mflags = nlm_cop2_enable_irqsave(); - ret = nlm_fmn_send(1, 0, stnid, &msg); -- nlm_cop2_restore(mflags); -+ nlm_cop2_disable_irqrestore(mflags); - if (ret == 0) - return 0; - } while (++num_try < 10000); -@@ -298,9 +298,9 @@ static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb, - u32 flags; - - xlr_make_tx_desc(&msg, virt_to_phys(skb->data), skb); -- flags = nlm_cop2_enable(); -+ flags = nlm_cop2_enable_irqsave(); - ret = nlm_fmn_send(2, 0, priv->nd->tx_stnid, &msg); -- nlm_cop2_restore(flags); -+ nlm_cop2_disable_irqrestore(flags); - if (ret) - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; --- -2.1.1 - - - -- 2.11.0