diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-12-01 09:59:53 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-12-01 09:59:53 +0000 |
| commit | 892e13e5c9f228ad2d2595276a2804bdf6bdb772 (patch) | |
| tree | 06a344df2e534c08c5652423d26acb7cbadea364 /target/linux/mpc85xx | |
| parent | ff2bdbe3b4429e7cfe82a5f1230ba75d394ebb31 (diff) | |
| download | upstream-892e13e5c9f228ad2d2595276a2804bdf6bdb772.tar.gz upstream-892e13e5c9f228ad2d2595276a2804bdf6bdb772.tar.bz2 upstream-892e13e5c9f228ad2d2595276a2804bdf6bdb772.zip | |
kernel: update 3.10 to 3.10.21
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38972 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mpc85xx')
| -rw-r--r-- | target/linux/mpc85xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 3e7cd38029..2f4bcc92d1 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> SUBTARGETS=generic p1020 -LINUX_VERSION:=3.10.18 +LINUX_VERSION:=3.10.21 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch b/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch index a1877be921..77cbc67ebc 100644 --- a/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch +++ b/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -2835,7 +2835,7 @@ static int gfar_poll(struct napi_struct +@@ -2835,7 +2835,7 @@ static int gfar_poll(struct napi_struct struct gfar_priv_rx_q *rx_queue = NULL; int work_done = 0, work_done_per_q = 0; int i, budget_per_q = 0; @@ -9,7 +9,7 @@ unsigned long rstat_rxf; int num_act_queues; -@@ -2850,62 +2850,48 @@ static int gfar_poll(struct napi_struct +@@ -2850,62 +2850,48 @@ static int gfar_poll(struct napi_struct if (num_act_queues) budget_per_q = budget/num_act_queues; |