projects / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 57f9576)
Add missing bracket in MAP-E FMR kernel support
authorcyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 23 May 2014 08:53:38 +0000 (08:53 +0000)
committercyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 23 May 2014 08:53:38 +0000 (08:53 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40830 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch patch | blob | history
target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch patch | blob | history
target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch patch | blob | history
target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch patch | blob | history

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 2397546..09b222d 100644 (file)
--- 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 2397546..09b222d 100644 (file)
--- 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 2397546..09b222d 100644 (file)
--- 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 2397546..09b222d 100644 (file)
--- 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;
 +      }
 +
OpenWrt main development branch