From b0ed76415fbcf82c899e644502aefe4e9eab519a Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@fedoraproject.org>
Date: Dec 05 2014 13:07:43 +0000
Subject: arm64-fix-xgene_enet_process_ring.patch: fix a panic under load


---

diff --git a/arm64-fix-xgene_enet_process_ring.patch b/arm64-fix-xgene_enet_process_ring.patch
new file mode 100644
index 0000000..ea23d75
--- /dev/null
+++ b/arm64-fix-xgene_enet_process_ring.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
++++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+@@ -390,7 +390,7 @@ static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring,
+ 		}
+ 	}
+ 
+-	return budget;
++	return count;
+ }
+ 
+ static int xgene_enet_napi(struct napi_struct *napi, const int budget)
diff --git a/kernel.spec b/kernel.spec
index be33e5c..91150b6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -573,6 +573,7 @@ Patch18000: ppc64-fixtools.patch
 # ARM64
 Patch20000: arm64-force-serial-to-be-active-consdev.patch
 Patch20001: arm64-vgic-error-to-info.patch
+Patch20002: arm64-fix-xgene_enet_process_ring.patch
 
 # ARMv7
 Patch21020: ARM-tegra-usb-no-reset.patch
@@ -1388,6 +1389,7 @@ ApplyPatch kernel-arm64.patch -R
 #  solved with SPCR in future
 ApplyPatch arm64-force-serial-to-be-active-consdev.patch
 ApplyPatch arm64-vgic-error-to-info.patch
+ApplyPatch arm64-fix-xgene_enet_process_ring.patch
 %endif
 %endif
 
@@ -2252,6 +2254,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Dec 05 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.17.4-303
+- arm64-fix-xgene_enet_process_ring.patch: fix a panic under load.
+
 * Thu Dec 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.4-302
 - CVE-2014-9090 local DoS via do_double_fault due to improper SS faults (rhbz 1170691)