Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 57781c1ceead5a3c1cd3ae11834226ef1de21cb5

Authored by Eric W. Biederman
Committed by Simon Horman
1 parent 9cfdd75b7c

ipvs: Pass ipvs into ip_vs_gather_frags 

This will be needed later when the network namespace guessing is
removed from ip_defrag.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff

net/netfilter/ipvs/ip_vs_core.c
Diff comments   View file @ 57781c1
... ... @@ -688,7 +688,8 @@
688 688 return IP_DEFRAG_VS_OUT;
689 689 }
690 690  
691   -static inline int ip_vs_gather_frags(struct sk_buff *skb, u_int32_t user)
  691 +static inline int ip_vs_gather_frags(struct netns_ipvs *ipvs,
  692 + struct sk_buff *skb, u_int32_t user)
692 693 {
693 694 int err;
694 695  
... ... @@ -912,7 +913,7 @@
912 913  
913 914 /* reassemble IP fragments */
914 915 if (ip_is_fragment(ip_hdr(skb))) {
915   - if (ip_vs_gather_frags(skb, ip_vs_defrag_user(hooknum)))
  916 + if (ip_vs_gather_frags(ipvs, skb, ip_vs_defrag_user(hooknum)))
916 917 return NF_STOLEN;
917 918 }
918 919  
... ... @@ -1232,7 +1233,7 @@
1232 1233 if (af == AF_INET)
1233 1234 #endif
1234 1235 if (unlikely(ip_is_fragment(ip_hdr(skb)) && !pp->dont_defrag)) {
1235   - if (ip_vs_gather_frags(skb,
  1236 + if (ip_vs_gather_frags(ipvs, skb,
1236 1237 ip_vs_defrag_user(hooknum)))
1237 1238 return NF_STOLEN;
1238 1239  
... ... @@ -1403,7 +1404,7 @@
1403 1404  
1404 1405 /* reassemble IP fragments */
1405 1406 if (ip_is_fragment(ip_hdr(skb))) {
1406   - if (ip_vs_gather_frags(skb, ip_vs_defrag_user(hooknum)))
  1407 + if (ip_vs_gather_frags(ipvs, skb, ip_vs_defrag_user(hooknum)))
1407 1408 return NF_STOLEN;
1408 1409 }
1409 1410