|
|
@@ -448,7 +448,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
|
|
|
if (warn)
|
|
|
km_state_expired(x, 0, 0);
|
|
|
resched:
|
|
|
- if (next != LONG_MAX){
|
|
|
+ if (next != LONG_MAX) {
|
|
|
tasklet_hrtimer_start(&x->mtimer, ktime_set(next, 0), HRTIMER_MODE_REL);
|
|
|
}
|
|
|
|
|
|
@@ -1348,7 +1348,7 @@ int xfrm_state_check_expire(struct xfrm_state *x)
|
|
|
if (x->curlft.bytes >= x->lft.hard_byte_limit ||
|
|
|
x->curlft.packets >= x->lft.hard_packet_limit) {
|
|
|
x->km.state = XFRM_STATE_EXPIRED;
|
|
|
- tasklet_hrtimer_start(&x->mtimer, ktime_set(0,0), HRTIMER_MODE_REL);
|
|
|
+ tasklet_hrtimer_start(&x->mtimer, ktime_set(0, 0), HRTIMER_MODE_REL);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
@@ -1542,7 +1542,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
|
|
|
x->id.spi = minspi;
|
|
|
} else {
|
|
|
u32 spi = 0;
|
|
|
- for (h=0; h<high-low+1; h++) {
|
|
|
+ for (h = 0; h < high-low+1; h++) {
|
|
|
spi = low + net_random()%(high-low+1);
|
|
|
x0 = xfrm_state_lookup(net, mark, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
|
|
|
if (x0 == NULL) {
|
|
|
@@ -2079,7 +2079,7 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
|
|
|
audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u sec_obj=%s",
|
|
|
ctx->ctx_alg, ctx->ctx_doi, ctx->ctx_str);
|
|
|
|
|
|
- switch(x->props.family) {
|
|
|
+ switch (x->props.family) {
|
|
|
case AF_INET:
|
|
|
audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
|
|
|
&x->props.saddr.a4, &x->id.daddr.a4);
|
|
|
@@ -2109,7 +2109,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
|
|
|
iph6 = ipv6_hdr(skb);
|
|
|
audit_log_format(audit_buf,
|
|
|
" src=%pI6 dst=%pI6 flowlbl=0x%x%02x%02x",
|
|
|
- &iph6->saddr,&iph6->daddr,
|
|
|
+ &iph6->saddr, &iph6->daddr,
|
|
|
iph6->flow_lbl[0] & 0x0f,
|
|
|
iph6->flow_lbl[1],
|
|
|
iph6->flow_lbl[2]);
|