From: Steven Barth <cyrus@openwrt.org>
Date: Fri, 23 May 2014 08:53:38 +0000 (+0000)
Subject: Add missing bracket in MAP-E FMR kernel support
X-Git-Tag: v19.07.0-rc1~17862
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=874b26933d8193156814bd418be95580f1d2a0fd;p=openwrt%2Fstaging%2Fhauke.git

Add missing bracket in MAP-E FMR kernel support

SVN-Revision: 40830
---

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;
 +	}
 +