ChangeSet 1.2199.15.1, 2005/03/22 22:40:53-03:00, [EMAIL PROTECTED]
[NET] use sk_acceptq_is_full
Replacing the open coded equivalent.
Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
atm/signaling.c | 3 +--
ax25/ax25_in.c | 2 +-
bluetooth/l2cap.c | 2 +-
bluetooth/rfcomm/sock.c | 2 +-
decnet/dn_nsp_in.c | 2 +-
netrom/af_netrom.c | 2 +-
rose/af_rose.c | 2 +-
sctp/sm_statefuns.c | 2 +-
x25/af_x25.c | 2 +-
9 files changed, 9 insertions(+), 10 deletions(-)
diff -Nru a/net/atm/signaling.c b/net/atm/signaling.c
--- a/net/atm/signaling.c 2005-03-26 17:13:52 -08:00
+++ b/net/atm/signaling.c 2005-03-26 17:13:52 -08:00
@@ -136,8 +136,7 @@
vcc = *(struct atm_vcc **) &msg->listen_vcc;
DPRINTK("as_indicate!!!\n");
lock_sock(sk);
- if (sk->sk_ack_backlog ==
- sk->sk_max_ack_backlog) {
+ if (sk_acceptq_is_full(sk)) {
sigd_enq(NULL,as_reject,vcc,NULL,NULL);
dev_kfree_skb(skb);
goto as_indicate_complete;
diff -Nru a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
--- a/net/ax25/ax25_in.c 2005-03-26 17:13:52 -08:00
+++ b/net/ax25/ax25_in.c 2005-03-26 17:13:52 -08:00
@@ -358,7 +358,7 @@
if (sk != NULL) {
bh_lock_sock(sk);
- if (sk->sk_ack_backlog == sk->sk_max_ack_backlog ||
+ if (sk_acceptq_is_full(sk) ||
(make = ax25_make_new(sk, ax25_dev)) == NULL) {
if (mine)
ax25_return_dm(dev, &src, &dest, &dp);
diff -Nru a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
--- a/net/bluetooth/l2cap.c 2005-03-26 17:13:52 -08:00
+++ b/net/bluetooth/l2cap.c 2005-03-26 17:13:52 -08:00
@@ -1415,7 +1415,7 @@
result = L2CAP_CR_NO_MEM;
/* Check for backlog size */
- if (parent->sk_ack_backlog > parent->sk_max_ack_backlog) {
+ if (sk_acceptq_is_full(parent)) {
BT_DBG("backlog full %d", parent->sk_ack_backlog);
goto response;
}
diff -Nru a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
--- a/net/bluetooth/rfcomm/sock.c 2005-03-26 17:13:52 -08:00
+++ b/net/bluetooth/rfcomm/sock.c 2005-03-26 17:13:52 -08:00
@@ -838,7 +838,7 @@
return 0;
/* Check for backlog size */
- if (parent->sk_ack_backlog > parent->sk_max_ack_backlog) {
+ if (sk_acceptq_is_full(parent)) {
BT_DBG("backlog full %d", parent->sk_ack_backlog);
goto done;
}
diff -Nru a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
--- a/net/decnet/dn_nsp_in.c 2005-03-26 17:13:52 -08:00
+++ b/net/decnet/dn_nsp_in.c 2005-03-26 17:13:52 -08:00
@@ -324,7 +324,7 @@
static void dn_nsp_conn_init(struct sock *sk, struct sk_buff *skb)
{
- if (sk->sk_ack_backlog >= sk->sk_max_ack_backlog) {
+ if (sk_acceptq_is_full(sk)) {
kfree_skb(skb);
return;
}
diff -Nru a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
--- a/net/netrom/af_netrom.c 2005-03-26 17:13:52 -08:00
+++ b/net/netrom/af_netrom.c 2005-03-26 17:13:52 -08:00
@@ -942,7 +942,7 @@
user = (ax25_address *)(skb->data + 21);
- if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog ||
+ if (sk == NULL || sk_acceptq_is_full(sk) ||
(make = nr_make_new(sk)) == NULL) {
nr_transmit_refusal(skb, 0);
if (sk)
diff -Nru a/net/rose/af_rose.c b/net/rose/af_rose.c
--- a/net/rose/af_rose.c 2005-03-26 17:13:52 -08:00
+++ b/net/rose/af_rose.c 2005-03-26 17:13:52 -08:00
@@ -958,7 +958,7 @@
/*
* We can't accept the Call Request.
*/
- if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog ||
+ if (sk == NULL || sk_acceptq_is_full(sk) ||
(make = rose_make_new(sk)) == NULL) {
rose_transmit_clear_request(neigh, lci,
ROSE_NETWORK_CONGESTION, 120);
return 0;
diff -Nru a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
--- a/net/sctp/sm_statefuns.c 2005-03-26 17:13:52 -08:00
+++ b/net/sctp/sm_statefuns.c 2005-03-26 17:13:52 -08:00
@@ -268,7 +268,7 @@
*/
if (!sctp_sstate(sk, LISTENING) ||
(sctp_style(sk, TCP) &&
- (sk->sk_ack_backlog >= sk->sk_max_ack_backlog)))
+ sk_acceptq_is_full(sk)))
return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
/* 3.1 A packet containing an INIT chunk MUST have a zero Verification
diff -Nru a/net/x25/af_x25.c b/net/x25/af_x25.c
--- a/net/x25/af_x25.c 2005-03-26 17:13:52 -08:00
+++ b/net/x25/af_x25.c 2005-03-26 17:13:52 -08:00
@@ -859,7 +859,7 @@
/*
* We can't accept the Call Request.
*/
- if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog)
+ if (sk == NULL || sk_acceptq_is_full(sk))
goto out_clear_request;
/*
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
