Skip to content

Commit 8e5443d

Browse files
kda88davem330
kda88
authored and
davem330
committed
net: remove SOCK_DEBUG leftovers
SOCK_DEBUG comes from the old days. Let's move logging to standard net core ratelimited logging functions Signed-off-by: Denis Kirjanov <dkirjanov@suse.de> changes in v2: - remove SOCK_DEBUG macro altogether Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent e3eb47f commit 8e5443d

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎net/appletalk/ddp.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
15811581
}
15821582

15831583
/* Build a packet */
1584-
SOCK_DEBUG(sk, "SK %p: Got address.\n", sk);
1584+
net_dbg_ratelimited("SK %p: Got address.\n", sk);
15851585

15861586
/* For headers */
15871587
size = sizeof(struct ddpehdr) + len + ddp_dl->header_length;
@@ -1602,7 +1602,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
16021602

16031603
dev = rt->dev;
16041604

1605-
SOCK_DEBUG(sk, "SK %p: Size needed %d, device %s\n",
1605+
net_dbg_ratelimited("SK %p: Size needed %d, device %s\n",
16061606
sk, size, dev->name);
16071607

16081608
hard_header_len = dev->hard_header_len;
@@ -1631,7 +1631,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
16311631
skb_reserve(skb, hard_header_len);
16321632
skb->dev = dev;
16331633

1634-
SOCK_DEBUG(sk, "SK %p: Begin build.\n", sk);
1634+
net_dbg_ratelimited("SK %p: Begin build.\n", sk);
16351635

16361636
ddp = skb_put(skb, sizeof(struct ddpehdr));
16371637
ddp->deh_len_hops = htons(len + sizeof(*ddp));
@@ -1642,7 +1642,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
16421642
ddp->deh_dport = usat->sat_port;
16431643
ddp->deh_sport = at->src_port;
16441644

1645-
SOCK_DEBUG(sk, "SK %p: Copy user data (%zd bytes).\n", sk, len);
1645+
net_dbg_ratelimited("SK %p: Copy user data (%zd bytes).\n", sk, len);
16461646

16471647
err = memcpy_from_msg(skb_put(skb, len), msg, len);
16481648
if (err) {
@@ -1666,7 +1666,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
16661666

16671667
if (skb2) {
16681668
loopback = 1;
1669-
SOCK_DEBUG(sk, "SK %p: send out(copy).\n", sk);
1669+
net_dbg_ratelimited("SK %p: send out(copy).\n", sk);
16701670
/*
16711671
* If it fails it is queued/sent above in the aarp queue
16721672
*/
@@ -1675,7 +1675,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
16751675
}
16761676

16771677
if (dev->flags & IFF_LOOPBACK || loopback) {
1678-
SOCK_DEBUG(sk, "SK %p: Loop back.\n", sk);
1678+
net_dbg_ratelimited("SK %p: Loop back.\n", sk);
16791679
/* loop back */
16801680
skb_orphan(skb);
16811681
if (ddp->deh_dnode == ATADDR_BCAST) {
@@ -1689,7 +1689,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
16891689
}
16901690
ddp_dl->request(ddp_dl, skb, dev->dev_addr);
16911691
} else {
1692-
SOCK_DEBUG(sk, "SK %p: send out.\n", sk);
1692+
net_dbg_ratelimited("SK %p: send out.\n", sk);
16931693
if (rt->flags & RTF_GATEWAY) {
16941694
gsat.sat_addr = rt->gateway;
16951695
usat = &gsat;
@@ -1700,7 +1700,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
17001700
*/
17011701
aarp_send_ddp(dev, skb, &usat->sat_addr, NULL);
17021702
}
1703-
SOCK_DEBUG(sk, "SK %p: Done write (%zd).\n", sk, len);
1703+
net_dbg_ratelimited("SK %p: Done write (%zd).\n", sk, len);
17041704

17051705
out:
17061706
release_sock(sk);

‎net/dccp/ipv6.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
889889
u32 exthdrlen = icsk->icsk_ext_hdr_len;
890890
struct sockaddr_in sin;
891891

892-
SOCK_DEBUG(sk, "connect: ipv4 mapped\n");
892+
net_dbg_ratelimited("connect: ipv4 mapped\n");
893893

894894
if (ipv6_only_sock(sk))
895895
return -ENETUNREACH;

‎net/x25/af_x25.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
704704
rc = -EINVAL;
705705
}
706706
release_sock(sk);
707-
SOCK_DEBUG(sk, "x25_bind: socket is bound\n");
707+
net_dbg_ratelimited("x25_bind: socket is bound\n");
708708
out:
709709
return rc;
710710
}
@@ -1165,10 +1165,10 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
11651165
goto out;
11661166
}
11671167

1168-
SOCK_DEBUG(sk, "x25_sendmsg: sendto: Addresses built.\n");
1168+
net_dbg_ratelimited("x25_sendmsg: sendto: Addresses built.\n");
11691169

11701170
/* Build a packet */
1171-
SOCK_DEBUG(sk, "x25_sendmsg: sendto: building packet.\n");
1171+
net_dbg_ratelimited("x25_sendmsg: sendto: building packet.\n");
11721172

11731173
if ((msg->msg_flags & MSG_OOB) && len > 32)
11741174
len = 32;
@@ -1187,7 +1187,7 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
11871187
/*
11881188
* Put the data on the end
11891189
*/
1190-
SOCK_DEBUG(sk, "x25_sendmsg: Copying user data\n");
1190+
net_dbg_ratelimited("x25_sendmsg: Copying user data\n");
11911191

11921192
skb_reset_transport_header(skb);
11931193
skb_put(skb, len);
@@ -1211,7 +1211,7 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
12111211
/*
12121212
* Push down the X.25 header
12131213
*/
1214-
SOCK_DEBUG(sk, "x25_sendmsg: Building X.25 Header.\n");
1214+
net_dbg_ratelimited("x25_sendmsg: Building X.25 Header.\n");
12151215

12161216
if (msg->msg_flags & MSG_OOB) {
12171217
if (x25->neighbour->extended) {
@@ -1245,8 +1245,8 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
12451245
skb->data[0] |= X25_Q_BIT;
12461246
}
12471247

1248-
SOCK_DEBUG(sk, "x25_sendmsg: Built header.\n");
1249-
SOCK_DEBUG(sk, "x25_sendmsg: Transmitting buffer\n");
1248+
net_dbg_ratelimited("x25_sendmsg: Built header.\n");
1249+
net_dbg_ratelimited("x25_sendmsg: Transmitting buffer\n");
12501250

12511251
rc = -ENOTCONN;
12521252
if (sk->sk_state != TCP_ESTABLISHED)

‎net/x25/x25_facilities.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk,
282282
* They want reverse charging, we won't accept it.
283283
*/
284284
if ((theirs.reverse & 0x01 ) && (ours->reverse & 0x01)) {
285-
SOCK_DEBUG(sk, "X.25: rejecting reverse charging request\n");
285+
net_dbg_ratelimited("X.25: rejecting reverse charging request\n");
286286
return -1;
287287
}
288288

@@ -294,34 +294,34 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk,
294294
int ours_in = ours->throughput & 0x0f;
295295
int ours_out = ours->throughput & 0xf0;
296296
if (!ours_in || theirs_in < ours_in) {
297-
SOCK_DEBUG(sk, "X.25: inbound throughput negotiated\n");
297+
net_dbg_ratelimited("X.25: inbound throughput negotiated\n");
298298
new->throughput = (new->throughput & 0xf0) | theirs_in;
299299
}
300300
if (!ours_out || theirs_out < ours_out) {
301-
SOCK_DEBUG(sk,
301+
net_dbg_ratelimited(
302302
"X.25: outbound throughput negotiated\n");
303303
new->throughput = (new->throughput & 0x0f) | theirs_out;
304304
}
305305
}
306306

307307
if (theirs.pacsize_in && theirs.pacsize_out) {
308308
if (theirs.pacsize_in < ours->pacsize_in) {
309-
SOCK_DEBUG(sk, "X.25: packet size inwards negotiated down\n");
309+
net_dbg_ratelimited("X.25: packet size inwards negotiated down\n");
310310
new->pacsize_in = theirs.pacsize_in;
311311
}
312312
if (theirs.pacsize_out < ours->pacsize_out) {
313-
SOCK_DEBUG(sk, "X.25: packet size outwards negotiated down\n");
313+
net_dbg_ratelimited("X.25: packet size outwards negotiated down\n");
314314
new->pacsize_out = theirs.pacsize_out;
315315
}
316316
}
317317

318318
if (theirs.winsize_in && theirs.winsize_out) {
319319
if (theirs.winsize_in < ours->winsize_in) {
320-
SOCK_DEBUG(sk, "X.25: window size inwards negotiated down\n");
320+
net_dbg_ratelimited("X.25: window size inwards negotiated down\n");
321321
new->winsize_in = theirs.winsize_in;
322322
}
323323
if (theirs.winsize_out < ours->winsize_out) {
324-
SOCK_DEBUG(sk, "X.25: window size outwards negotiated down\n");
324+
net_dbg_ratelimited("X.25: window size outwards negotiated down\n");
325325
new->winsize_out = theirs.winsize_out;
326326
}
327327
}

‎net/x25/x25_out.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
7272
kfree_skb(skb);
7373
return sent;
7474
}
75-
SOCK_DEBUG(sk, "x25_output: fragment alloc"
75+
net_dbg_ratelimited("x25_output: fragment alloc"
7676
" failed, err=%d, %d bytes "
7777
"sent\n", err, sent);
7878
return err;

0 commit comments

Comments
 (0)