Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 169
Star 36
Fork 7
cloud-kernel
cloud-kernel
“9eb599e9c62dcfd4efece1936c385381b366b684”上不存在“drivers/net/wireless/ti/wlcore/debugfs.c”
提交 fdb46ee7 编写于 作者: H Harvey Harrison 提交者： David S. Miller
浏览文件
操作

net, misc: replace uses of NIP6_FMT with %p6 

Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 0c6ce78a
隐藏空白更改
内联 并排
Showing with 39 addition and 55 deletion
net/netlabel/netlabel_addrlist.c
浏览文件 @ fdb46ee7
...@@ -370,7 +370,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, ...@@ -370,7 +370,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
if (dev != NULL) if (dev != NULL)
audit_log_format(audit_buf, " netif=%s", dev); audit_log_format(audit_buf, " netif=%s", dev);
audit_log_format(audit_buf, " %s=" NIP6_FMT, dir, NIP6(*addr)); audit_log_format(audit_buf, " %s=%p6", dir, addr);
if (ntohl(mask->s6_addr32[3]) != 0xffffffff) { if (ntohl(mask->s6_addr32[3]) != 0xffffffff) {
u32 mask_len = 0; u32 mask_len = 0;
u32 mask_val; u32 mask_val;
......
net/sctp/ipv6.c
浏览文件 @ fdb46ee7
...@@ -223,10 +223,9 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport) ...@@ -223,10 +223,9 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)
ipv6_addr_copy(&fl.fl6_dst, rt0->addr); ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
} }
SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, " SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%p6 dst:%p6\n",
"src:" NIP6_FMT " dst:" NIP6_FMT "\n",
__func__, skb, skb->len, __func__, skb, skb->len,
NIP6(fl.fl6_src), NIP6(fl.fl6_dst)); &fl.fl6_src, &fl.fl6_dst);
SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS); SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS);
...@@ -252,23 +251,19 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc, ...@@ -252,23 +251,19 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
fl.oif = daddr->v6.sin6_scope_id; fl.oif = daddr->v6.sin6_scope_id;
SCTP_DEBUG_PRINTK("%s: DST=" NIP6_FMT " ", SCTP_DEBUG_PRINTK("%s: DST=%p6 ", __func__, &fl.fl6_dst);
__func__, NIP6(fl.fl6_dst));
if (saddr) { if (saddr) {
ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr); ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr);
SCTP_DEBUG_PRINTK( SCTP_DEBUG_PRINTK("SRC=%p6 - ", &fl.fl6_src);
"SRC=" NIP6_FMT " - ",
NIP6(fl.fl6_src));
} }
dst = ip6_route_output(&init_net, NULL, &fl); dst = ip6_route_output(&init_net, NULL, &fl);
if (!dst->error) { if (!dst->error) {
struct rt6_info *rt; struct rt6_info *rt;
rt = (struct rt6_info *)dst; rt = (struct rt6_info *)dst;
SCTP_DEBUG_PRINTK( SCTP_DEBUG_PRINTK("rt6_dst:%p6 rt6_src:%p6\n",
"rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n", &rt->rt6i_dst.addr, &rt->rt6i_src.addr);
NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr));
return dst; return dst;
} }
SCTP_DEBUG_PRINTK("NO ROUTE\n"); SCTP_DEBUG_PRINTK("NO ROUTE\n");
...@@ -314,9 +309,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, ...@@ -314,9 +309,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
__u8 matchlen = 0; __u8 matchlen = 0;
__u8 bmatchlen; __u8 bmatchlen;
SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p " SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%p6 ",
"daddr:" NIP6_FMT " ", __func__, asoc, dst, &daddr->v6.sin6_addr);
__func__, asoc, dst, NIP6(daddr->v6.sin6_addr));
if (!asoc) { if (!asoc) {
ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)), ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)),
...@@ -324,8 +318,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, ...@@ -324,8 +318,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
&daddr->v6.sin6_addr, &daddr->v6.sin6_addr,
inet6_sk(&sk->inet.sk)->srcprefs, inet6_sk(&sk->inet.sk)->srcprefs,
&saddr->v6.sin6_addr); &saddr->v6.sin6_addr);
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n", SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %p6\n",
NIP6(saddr->v6.sin6_addr)); &saddr->v6.sin6_addr);
return; return;
} }
...@@ -353,12 +347,11 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, ...@@ -353,12 +347,11 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
if (baddr) { if (baddr) {
memcpy(saddr, baddr, sizeof(union sctp_addr)); memcpy(saddr, baddr, sizeof(union sctp_addr));
SCTP_DEBUG_PRINTK("saddr: " NIP6_FMT "\n", SCTP_DEBUG_PRINTK("saddr: %p6\n", &saddr->v6.sin6_addr);
NIP6(saddr->v6.sin6_addr));
} else { } else {
printk(KERN_ERR "%s: asoc:%p Could not find a valid source " printk(KERN_ERR "%s: asoc:%p Could not find a valid source "
"address for the dest:" NIP6_FMT "\n", "address for the dest:%p6\n",
__func__, asoc, NIP6(daddr->v6.sin6_addr)); __func__, asoc, &daddr->v6.sin6_addr);
} }
rcu_read_unlock(); rcu_read_unlock();
...@@ -727,7 +720,7 @@ static int sctp_v6_is_ce(const struct sk_buff *skb) ...@@ -727,7 +720,7 @@ static int sctp_v6_is_ce(const struct sk_buff *skb)
/* Dump the v6 addr to the seq file. */ /* Dump the v6 addr to the seq file. */
static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr)
{ {
seq_printf(seq, NIP6_FMT " ", NIP6(addr->v6.sin6_addr)); seq_printf(seq, "%p6 ", &addr->v6.sin6_addr);
} }
static void sctp_v6_ecn_capable(struct sock *sk) static void sctp_v6_ecn_capable(struct sock *sk)
......
net/sctp/sm_statefuns.c
浏览文件 @ fdb46ee7
...@@ -1123,11 +1123,10 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep, ...@@ -1123,11 +1123,10 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
if (from_addr.sa.sa_family == AF_INET6) { if (from_addr.sa.sa_family == AF_INET6) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_WARNING printk(KERN_WARNING
"%s association %p could not find address " "%s association %p could not find address %p6\n",
NIP6_FMT "\n",
__func__, __func__,
asoc, asoc,
NIP6(from_addr.v6.sin6_addr)); &from_addr.v6.sin6_addr);
} else { } else {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_WARNING printk(KERN_WARNING
......
net/sunrpc/clnt.c
浏览文件 @ fdb46ee7
...@@ -278,8 +278,8 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) ...@@ -278,8 +278,8 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
case AF_INET6: { case AF_INET6: {
struct sockaddr_in6 *sin = struct sockaddr_in6 *sin =
(struct sockaddr_in6 *)args->address; (struct sockaddr_in6 *)args->address;
snprintf(servername, sizeof(servername), NIP6_FMT, snprintf(servername, sizeof(servername), "%p6",
NIP6(sin->sin6_addr)); &sin->sin6_addr);
break; break;
} }
default: default:
......
net/sunrpc/rpcb_clnt.c
浏览文件 @ fdb46ee7
...@@ -305,9 +305,9 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register, ...@@ -305,9 +305,9 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
snprintf(buf, sizeof(buf), "::.%u.%u", snprintf(buf, sizeof(buf), "::.%u.%u",
port >> 8, port & 0xff); port >> 8, port & 0xff);
else else
snprintf(buf, sizeof(buf), NIP6_FMT".%u.%u", snprintf(buf, sizeof(buf), "%p6.%u.%u",
NIP6(address_to_register->sin6_addr), &address_to_register->sin6_addr,
port >> 8, port & 0xff); port >> 8, port & 0xff);
map->r_addr = buf; map->r_addr = buf;
dprintk("RPC: %sregistering [%u, %u, %s, '%s'] with " dprintk("RPC: %sregistering [%u, %u, %s, '%s'] with "
......
net/sunrpc/svcauth_unix.c
浏览文件 @ fdb46ee7
...@@ -168,7 +168,7 @@ static void ip_map_request(struct cache_detail *cd, ...@@ -168,7 +168,7 @@ static void ip_map_request(struct cache_detail *cd,
ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff, ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff,
ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff); ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff);
} else { } else {
snprintf(text_addr, 40, NIP6_FMT, NIP6(im->m_addr)); snprintf(text_addr, 40, "%p6", &im->m_addr);
} }
qword_add(bpp, blen, im->m_class); qword_add(bpp, blen, im->m_class);
qword_add(bpp, blen, text_addr); qword_add(bpp, blen, text_addr);
...@@ -286,8 +286,7 @@ static int ip_map_show(struct seq_file *m, ...@@ -286,8 +286,7 @@ static int ip_map_show(struct seq_file *m,
ntohl(addr.s6_addr32[3]) >> 0 & 0xff, ntohl(addr.s6_addr32[3]) >> 0 & 0xff,
dom); dom);
} else { } else {
seq_printf(m, "%s " NIP6_FMT " %s\n", seq_printf(m, "%s %p6 %s\n", im->m_class, &addr, dom);
im->m_class, NIP6(addr), dom);
} }
return 0; return 0;
} }
......
net/sunrpc/xprtsock.c
浏览文件 @ fdb46ee7
...@@ -341,8 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt, ...@@ -341,8 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
buf = kzalloc(40, GFP_KERNEL); buf = kzalloc(40, GFP_KERNEL);
if (buf) { if (buf) {
snprintf(buf, 40, NIP6_FMT, snprintf(buf, 40, "%p6",&addr->sin6_addr);
NIP6(addr->sin6_addr));
} }
xprt->address_strings[RPC_DISPLAY_ADDR] = buf; xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
...@@ -357,8 +356,8 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt, ...@@ -357,8 +356,8 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
buf = kzalloc(64, GFP_KERNEL); buf = kzalloc(64, GFP_KERNEL);
if (buf) { if (buf) {
snprintf(buf, 64, "addr="NIP6_FMT" port=%u proto=%s", snprintf(buf, 64, "addr=%p6 port=%u proto=%s",
NIP6(addr->sin6_addr), &addr->sin6_addr,
ntohs(addr->sin6_port), ntohs(addr->sin6_port),
protocol); protocol);
} }
...@@ -379,10 +378,10 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt, ...@@ -379,10 +378,10 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
buf = kzalloc(50, GFP_KERNEL); buf = kzalloc(50, GFP_KERNEL);
if (buf) { if (buf) {
snprintf(buf, 50, NIP6_FMT".%u.%u", snprintf(buf, 50, "%p6.%u.%u",
NIP6(addr->sin6_addr), &addr->sin6_addr,
ntohs(addr->sin6_port) >> 8, ntohs(addr->sin6_port) >> 8,
ntohs(addr->sin6_port) & 0xff); ntohs(addr->sin6_port) & 0xff);
} }
xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf; xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
...@@ -1408,8 +1407,8 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock) ...@@ -1408,8 +1407,8 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
if (port > last) if (port > last)
nloop++; nloop++;
} while (err == -EADDRINUSE && nloop != 2); } while (err == -EADDRINUSE && nloop != 2);
dprintk("RPC: xs_bind6 "NIP6_FMT":%u: %s (%d)\n", dprintk("RPC: xs_bind6 %p6:%u: %s (%d)\n",
NIP6(myaddr.sin6_addr), port, err ? "failed" : "ok", err); &myaddr.sin6_addr, port, err ? "failed" : "ok", err);
return err; return err;
} }
......
net/xfrm/xfrm_policy.c
浏览文件 @ fdb46ee7
...@@ -2467,13 +2467,11 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp, ...@@ -2467,13 +2467,11 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
sel->prefixlen_d); sel->prefixlen_d);
break; break;
case AF_INET6: case AF_INET6:
audit_log_format(audit_buf, " src=" NIP6_FMT, audit_log_format(audit_buf, " src=%p6", sel->saddr.a6);
NIP6(*(struct in6_addr *)sel->saddr.a6));
if (sel->prefixlen_s != 128) if (sel->prefixlen_s != 128)
audit_log_format(audit_buf, " src_prefixlen=%d", audit_log_format(audit_buf, " src_prefixlen=%d",
sel->prefixlen_s); sel->prefixlen_s);
audit_log_format(audit_buf, " dst=" NIP6_FMT, audit_log_format(audit_buf, " dst=%p6", sel->daddr.a6);
NIP6(*(struct in6_addr *)sel->daddr.a6));
if (sel->prefixlen_d != 128) if (sel->prefixlen_d != 128)
audit_log_format(audit_buf, " dst_prefixlen=%d", audit_log_format(audit_buf, " dst_prefixlen=%d",
sel->prefixlen_d); sel->prefixlen_d);
......
net/xfrm/xfrm_state.c
浏览文件 @ fdb46ee7
...@@ -2115,10 +2115,8 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x, ...@@ -2115,10 +2115,8 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
NIPQUAD(x->id.daddr.a4)); NIPQUAD(x->id.daddr.a4));
break; break;
case AF_INET6: case AF_INET6:
audit_log_format(audit_buf, audit_log_format(audit_buf, " src=%p6 dst=%p6",
" src=" NIP6_FMT " dst=" NIP6_FMT, x->props.saddr.a6, x->id.daddr.a6);
NIP6(*(struct in6_addr *)x->props.saddr.a6),
NIP6(*(struct in6_addr *)x->id.daddr.a6));
break; break;
} }
...@@ -2142,10 +2140,8 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family, ...@@ -2142,10 +2140,8 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
case AF_INET6: case AF_INET6:
iph6 = ipv6_hdr(skb); iph6 = ipv6_hdr(skb);
audit_log_format(audit_buf, audit_log_format(audit_buf,
" src=" NIP6_FMT " dst=" NIP6_FMT " src=%p6 dst=%p6 flowlbl=0x%x%02x%02x",
" flowlbl=0x%x%02x%02x", &iph6->saddr,&iph6->daddr,
NIP6(iph6->saddr),
NIP6(iph6->daddr),
iph6->flow_lbl[0] & 0x0f, iph6->flow_lbl[0] & 0x0f,
iph6->flow_lbl[1], iph6->flow_lbl[1],
iph6->flow_lbl[2]); iph6->flow_lbl[2]);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或