aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-05-23 08:53:38 +0000
committerSteven Barth <steven@midlink.org>2014-05-23 08:53:38 +0000
commitf0cf7240b0ea36af381a30ff517403c6e6b2a259 (patch)
tree8ff9f0254e1194eca9dfb754af492fa236cdab5c /target
parent10a05d152c77b261dfcc445aad7090422c9b9152 (diff)
downloadupstream-f0cf7240b0ea36af381a30ff517403c6e6b2a259.tar.gz
upstream-f0cf7240b0ea36af381a30ff517403c6e6b2a259.tar.bz2
upstream-f0cf7240b0ea36af381a30ff517403c6e6b2a259.zip
Add missing bracket in MAP-E FMR kernel support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40830 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch4
-rw-r--r--target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch4
-rw-r--r--target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch4
-rw-r--r--target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch4
4 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 239754630a..09b222d11a 100644
--- a/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+
+ /* use icmp identifier as port */
-+ if (((u8*)&ih) <= end &&
++ if (((u8*)&ih) <= end && (
+ (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY ||
@@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ )))
+ portp = (u8*)&ih->un.echo.id;
+ }
+
diff --git a/target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 239754630a..09b222d11a 100644
--- a/target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+
+ /* use icmp identifier as port */
-+ if (((u8*)&ih) <= end &&
++ if (((u8*)&ih) <= end && (
+ (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY ||
@@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ )))
+ portp = (u8*)&ih->un.echo.id;
+ }
+
diff --git a/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 239754630a..09b222d11a 100644
--- a/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+
+ /* use icmp identifier as port */
-+ if (((u8*)&ih) <= end &&
++ if (((u8*)&ih) <= end && (
+ (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY ||
@@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ )))
+ portp = (u8*)&ih->un.echo.id;
+ }
+
diff --git a/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 239754630a..09b222d11a 100644
--- a/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+
+ /* use icmp identifier as port */
-+ if (((u8*)&ih) <= end &&
++ if (((u8*)&ih) <= end && (
+ (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY ||
@@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ )))
+ portp = (u8*)&ih->un.echo.id;
+ }
+