debug代码整理,sockaddr_nin结构增加1字节强制对齐,checkpatch告警清理

Signed-off-by: yangyanjun <yangyanjun@huawei.com>
This commit is contained in:
yangyanjun
2022-08-01 11:23:37 +08:00
parent ba0894aaac
commit 51a817b6bf
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -578,7 +578,7 @@ int nip_route_ioctl(struct net *net, unsigned int cmd, struct nip_rtmsg *rtmsg)
if (cfg.fc_flags & RTF_GATEWAY) {
if (nip_addr_invalid(&cfg.fc_gateway)) {
DEBUG("%s: nip gateway daddr invalid, bitlen=%u",
DEBUG("%s: nip gateway daddr invalid, bitlen=%u",
__func__, cfg.fc_gateway.bitlen);
return -EFAULT;
}
+3 -3
View File
@@ -692,12 +692,12 @@ void tcp_nip_keepalive_enable(struct sock *sk)
g_nip_keepalive_intvl,
g_nip_keepalive_probes);
if (ret != 0) {
pr_crit("%s fail, ka_time=%u, ka_probes=%u, ka_intvl=%u",__func__,
pr_crit("%s fail, ka_time=%u, ka_probes=%u, ka_intvl=%u", __func__,
tp->keepalive_time, tp->keepalive_probes, tp->keepalive_intvl);
return;
}
pr_crit("%s ok, ka_time=%u, ka_probes=%u, ka_intvl=%u",__func__,
pr_crit("%s ok, ka_time=%u, ka_probes=%u, ka_intvl=%u", __func__,
tp->keepalive_time, tp->keepalive_probes, tp->keepalive_intvl);
tp->nip_keepalive_enable = true;
}
@@ -1565,7 +1565,7 @@ int tcp_nip_disconnect(struct sock *sk, int flags)
struct sock *ninet_csk_accept(struct sock *sk, int flags, int *err, bool kern)
{
struct sock * newsk;
struct sock *newsk;
u32 sk_ack_backlog_last = READ_ONCE(sk->sk_ack_backlog);
newsk = inet_csk_accept(sk, flags, err, kern);
+2 -2
View File
@@ -205,9 +205,9 @@ void tcp_nip_probe_timer(struct sock *sk)
}
if (icsk->icsk_probes_out >= max_probes) {
abort: pr_crit("%s close session, icsk_backoff=%u, max_probes=%u",
abort: tcp_nip_write_err(sk);
pr_crit("%s close session, icsk_backoff=%u, max_probes=%u",
__func__, icsk->icsk_backoff, max_probes);
tcp_nip_write_err(sk);
} else {
/* Only send another probe if we didn't close things up. */
tcp_nip_send_probe0(sk);