diff options
Diffstat (limited to 'target/linux/generic/patches-3.0')
7 files changed, 10 insertions, 38 deletions
diff --git a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch index 4810713889..2d6dcf1288 100644 --- a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch +++ b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch @@ -3057,7 +3057,7 @@ +the future. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4717,6 +4717,13 @@ F: drivers/scsi/osd/ +@@ -4727,6 +4727,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ diff --git a/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch index dac898276d..778efac2b9 100644 --- a/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch +++ b/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch @@ -4,12 +4,12 @@ dst = NULL; -- if (is_multicast_ether_addr(dest)) { +- if (is_broadcast_ether_addr(dest)) + if (skb->protocol == htons(ETH_P_PAE)) { + skb2 = skb; + /* Do not forward 802.1x/EAP frames */ + skb = NULL; -+ } else if (is_multicast_ether_addr(dest)) { ++ } else if (is_broadcast_ether_addr(dest)) + skb2 = skb; + else if (is_multicast_ether_addr(dest)) { mdst = br_mdb_get(br, skb); - if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) { - if ((mdst && mdst->mglist) || diff --git a/target/linux/generic/patches-3.0/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.0/642-bridge_port_isolate.patch index 46ee5e953b..1964e1893c 100644 --- a/target/linux/generic/patches-3.0/642-bridge_port_isolate.patch +++ b/target/linux/generic/patches-3.0/642-bridge_port_isolate.patch @@ -43,7 +43,7 @@ #endif --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -95,7 +95,8 @@ int br_handle_frame_finish(struct sk_buf +@@ -97,7 +97,8 @@ int br_handle_frame_finish(struct sk_buf skb2 = skb; br->dev->stats.multicast++; diff --git a/target/linux/generic/patches-3.0/863-gpiommc.patch b/target/linux/generic/patches-3.0/863-gpiommc.patch index cf44041cce..943c5fff0e 100644 --- a/target/linux/generic/patches-3.0/863-gpiommc.patch +++ b/target/linux/generic/patches-3.0/863-gpiommc.patch @@ -829,7 +829,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2901,6 +2901,11 @@ L: linuxppc-dev@lists.ozlabs.org +@@ -2911,6 +2911,11 @@ L: linuxppc-dev@lists.ozlabs.org S: Odd Fixes F: drivers/tty/hvc/ diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch index 0ba09166c0..b9e6f40885 100644 --- a/target/linux/generic/patches-3.0/950-vm_exports.patch +++ b/target/linux/generic/patches-3.0/950-vm_exports.patch @@ -71,7 +71,7 @@ --- a/mm/memory.c +++ b/mm/memory.c -@@ -1395,6 +1395,7 @@ unsigned long zap_page_range(struct vm_a +@@ -1396,6 +1396,7 @@ unsigned long zap_page_range(struct vm_a tlb_finish_mmu(&tlb, address, end); return end; } @@ -79,7 +79,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -3014,6 +3015,7 @@ static inline int check_stack_guard_page +@@ -3015,6 +3016,7 @@ static inline int check_stack_guard_page } return 0; } diff --git a/target/linux/generic/patches-3.0/991-arm_smp_twd_fix_typo.patch b/target/linux/generic/patches-3.0/991-arm_smp_twd_fix_typo.patch deleted file mode 100644 index 9574757279..0000000000 --- a/target/linux/generic/patches-3.0/991-arm_smp_twd_fix_typo.patch +++ /dev/null @@ -1,28 +0,0 @@ -To get hundredths of MHz the rate needs to be divided by 10'000. -Here is an example: - twd_timer_rate = 123456789 - Before the patch: - twd_timer_rate / 1000000 = 123 - (twd_timer_rate / 1000000) % 100 = 23 - Result: 123.23MHz. - After being fixed: - twd_timer_rate / 1000000 = 123 - (twd_timer_rate / 10000) % 100 = 45 - Result: 123.45MHz. - -Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> ---- - arch/arm/kernel/smp_twd.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/arch/arm/kernel/smp_twd.c -+++ b/arch/arm/kernel/smp_twd.c -@@ -115,7 +115,7 @@ static void __cpuinit twd_calibrate_rate - twd_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5); - - printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, -- (twd_timer_rate / 1000000) % 100); -+ (twd_timer_rate / 10000) % 100); - } - } - diff --git a/target/linux/generic/patches-3.0/999-drop_sublevel.patch b/target/linux/generic/patches-3.0/999-drop_sublevel.patch index f6bb285545..f85fc861f0 100644 --- a/target/linux/generic/patches-3.0/999-drop_sublevel.patch +++ b/target/linux/generic/patches-3.0/999-drop_sublevel.patch @@ -4,6 +4,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 0 - EXTRAVERSION = -rc6 + EXTRAVERSION = -rc7 NAME = Sneaky Weasel |