Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing bracket in MAP-E FMR kernel support

Browse Source 
SVN-Revision: 40830
This commit is contained in:
Steven Barth 2014-05-23 08:53:38 +00:00
parent 2381f4a7b0
commit 874b26933d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); + struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+ +
+ /* use icmp identifier as port */ + /* use icmp identifier as port */
+ if (((u8*)&ih) <= end && + if (((u8*)&ih) <= end && (
+ (use_dest_addr && ( + (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY || + ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY || + ih->type == ICMP_TIMESTAMPREPLY ||
@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP || + ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST || + ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS) + ih->type == ICMP_ADDRESS)
+ )) + )))
+ portp = (u8*)&ih->un.echo.id; + portp = (u8*)&ih->un.echo.id;
+ } + }
+ +

4
target/linux/generic/patches-3.12/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); + struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+ +
+ /* use icmp identifier as port */ + /* use icmp identifier as port */
+ if (((u8*)&ih) <= end && + if (((u8*)&ih) <= end && (
+ (use_dest_addr && ( + (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY || + ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY || + ih->type == ICMP_TIMESTAMPREPLY ||
@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP || + ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST || + ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS) + ih->type == ICMP_ADDRESS)
+ )) + )))
+ portp = (u8*)&ih->un.echo.id; + portp = (u8*)&ih->un.echo.id;
+ } + }
+ +

4
target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); + struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+ +
+ /* use icmp identifier as port */ + /* use icmp identifier as port */
+ if (((u8*)&ih) <= end && + if (((u8*)&ih) <= end && (
+ (use_dest_addr && ( + (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY || + ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY || + ih->type == ICMP_TIMESTAMPREPLY ||
@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP || + ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST || + ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS) + ih->type == ICMP_ADDRESS)
+ )) + )))
+ portp = (u8*)&ih->un.echo.id; + portp = (u8*)&ih->un.echo.id;
+ } + }
+ +

4
target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -207,7 +207,7 @@ index b05b609..c2216b0 100644
+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); + struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
+ +
+ /* use icmp identifier as port */ + /* use icmp identifier as port */
+ if (((u8*)&ih) <= end && + if (((u8*)&ih) <= end && (
+ (use_dest_addr && ( + (use_dest_addr && (
+ ih->type == ICMP_ECHOREPLY || + ih->type == ICMP_ECHOREPLY ||
+ ih->type == ICMP_TIMESTAMPREPLY || + ih->type == ICMP_TIMESTAMPREPLY ||
@ -218,7 +218,7 @@ index b05b609..c2216b0 100644
+ ih->type == ICMP_TIMESTAMP || + ih->type == ICMP_TIMESTAMP ||
+ ih->type == ICMP_INFO_REQUEST || + ih->type == ICMP_INFO_REQUEST ||
+ ih->type == ICMP_ADDRESS) + ih->type == ICMP_ADDRESS)
+ )) + )))
+ portp = (u8*)&ih->un.echo.id; + portp = (u8*)&ih->un.echo.id;
+ } + }
+ +