projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2381f4a
)
Add missing bracket in MAP-E FMR kernel support
author
Steven Barth
<cyrus@openwrt.org>
Fri, 23 May 2014 08:53:38 +0000
(08:53 +0000)
committer
Steven Barth
<cyrus@openwrt.org>
Fri, 23 May 2014 08:53:38 +0000
(08:53 +0000)
SVN-Revision: 40830
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 239754630aac73973a0cffb4d304240989ac60d9..09b222d11a7047aa04e9c79edf207215744045b9 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 */
+ 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 ||
+ (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)
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ ))
)
+ portp = (u8*)&ih->un.echo.id;
+ }
+
+ 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 239754630aac73973a0cffb4d304240989ac60d9..09b222d11a7047aa04e9c79edf207215744045b9 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 */
+ 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 ||
+ (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)
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ ))
)
+ portp = (u8*)&ih->un.echo.id;
+ }
+
+ 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 239754630aac73973a0cffb4d304240989ac60d9..09b222d11a7047aa04e9c79edf207215744045b9 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 */
+ 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 ||
+ (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)
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ ))
)
+ portp = (u8*)&ih->un.echo.id;
+ }
+
+ 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 239754630aac73973a0cffb4d304240989ac60d9..09b222d11a7047aa04e9c79edf207215744045b9 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 */
+ 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 ||
+ (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)
+ ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS)
-+ ))
++ ))
)
+ portp = (u8*)&ih->un.echo.id;
+ }
+
+ portp = (u8*)&ih->un.echo.id;
+ }
+