aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_policy.c2
-rw-r--r--net/xfrm/xfrm_state.c8
-rw-r--r--net/xfrm/xfrm_user.c22
3 files changed, 16 insertions, 16 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 194257554553..762926009c04 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1049,7 +1049,7 @@ static inline int policy_to_flow_dir(int dir)
1049 return FLOW_DIR_OUT; 1049 return FLOW_DIR_OUT;
1050 case XFRM_POLICY_FWD: 1050 case XFRM_POLICY_FWD:
1051 return FLOW_DIR_FWD; 1051 return FLOW_DIR_FWD;
1052 }; 1052 }
1053} 1053}
1054 1054
1055static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl) 1055static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl)
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 69a3600afd9d..743f07e7f698 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -458,7 +458,7 @@ static struct xfrm_state *__xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi,
458 x->id.daddr.a6)) 458 x->id.daddr.a6))
459 continue; 459 continue;
460 break; 460 break;
461 }; 461 }
462 462
463 xfrm_state_hold(x); 463 xfrm_state_hold(x);
464 return x; 464 return x;
@@ -493,7 +493,7 @@ static struct xfrm_state *__xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm
493 x->props.saddr.a6)) 493 x->props.saddr.a6))
494 continue; 494 continue;
495 break; 495 break;
496 }; 496 }
497 497
498 xfrm_state_hold(x); 498 xfrm_state_hold(x);
499 return x; 499 return x;
@@ -722,7 +722,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
722 (struct in6_addr *)saddr)) 722 (struct in6_addr *)saddr))
723 continue; 723 continue;
724 break; 724 break;
725 }; 725 }
726 726
727 xfrm_state_hold(x); 727 xfrm_state_hold(x);
728 return x; 728 return x;
@@ -755,7 +755,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
755 ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6, 755 ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
756 (struct in6_addr *)daddr); 756 (struct in6_addr *)daddr);
757 break; 757 break;
758 }; 758 }
759 759
760 x->km.state = XFRM_STATE_ACQ; 760 x->km.state = XFRM_STATE_ACQ;
761 x->id.proto = proto; 761 x->id.proto = proto;
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 88659edc9b1a..f91521d5f2ab 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -71,7 +71,7 @@ static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type)
71 71
72 default: 72 default:
73 return -EINVAL; 73 return -EINVAL;
74 }; 74 }
75 75
76 algp->alg_name[CRYPTO_MAX_ALG_NAME - 1] = '\0'; 76 algp->alg_name[CRYPTO_MAX_ALG_NAME - 1] = '\0';
77 return 0; 77 return 0;
@@ -152,7 +152,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
152 152
153 default: 153 default:
154 goto out; 154 goto out;
155 }; 155 }
156 156
157 err = -EINVAL; 157 err = -EINVAL;
158 switch (p->id.proto) { 158 switch (p->id.proto) {
@@ -192,7 +192,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
192 192
193 default: 193 default:
194 goto out; 194 goto out;
195 }; 195 }
196 196
197 if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH))) 197 if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH)))
198 goto out; 198 goto out;
@@ -217,7 +217,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
217 217
218 default: 218 default:
219 goto out; 219 goto out;
220 }; 220 }
221 221
222 err = 0; 222 err = 0;
223 223
@@ -711,7 +711,7 @@ static int verify_userspi_info(struct xfrm_userspi_info *p)
711 711
712 default: 712 default:
713 return -EINVAL; 713 return -EINVAL;
714 }; 714 }
715 715
716 if (p->min > p->max) 716 if (p->min > p->max)
717 return -EINVAL; 717 return -EINVAL;
@@ -789,7 +789,7 @@ static int verify_policy_dir(u8 dir)
789 789
790 default: 790 default:
791 return -EINVAL; 791 return -EINVAL;
792 }; 792 }
793 793
794 return 0; 794 return 0;
795} 795}
@@ -805,7 +805,7 @@ static int verify_policy_type(u8 type)
805 805
806 default: 806 default:
807 return -EINVAL; 807 return -EINVAL;
808 }; 808 }
809 809
810 return 0; 810 return 0;
811} 811}
@@ -821,7 +821,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
821 821
822 default: 822 default:
823 return -EINVAL; 823 return -EINVAL;
824 }; 824 }
825 825
826 switch (p->action) { 826 switch (p->action) {
827 case XFRM_POLICY_ALLOW: 827 case XFRM_POLICY_ALLOW:
@@ -830,7 +830,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
830 830
831 default: 831 default:
832 return -EINVAL; 832 return -EINVAL;
833 }; 833 }
834 834
835 switch (p->sel.family) { 835 switch (p->sel.family) {
836 case AF_INET: 836 case AF_INET:
@@ -845,7 +845,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
845 845
846 default: 846 default:
847 return -EINVAL; 847 return -EINVAL;
848 }; 848 }
849 849
850 return verify_policy_dir(p->dir); 850 return verify_policy_dir(p->dir);
851} 851}
@@ -912,7 +912,7 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
912#endif 912#endif
913 default: 913 default:
914 return -EINVAL; 914 return -EINVAL;
915 }; 915 }
916 } 916 }
917 917
918 return 0; 918 return 0;