ChangeSet 1.2199.14.37, 2005/03/23 12:32:50-08:00, [EMAIL PROTECTED]
Merge bk://kernel.bkbits.net/acme/net-2.6
into sunset.davemloft.net:/home/davem/src/BK/acme-2.6
bluetooth/l2cap.c | 3 ---
bluetooth/rfcomm/sock.c | 3 ---
netrom/af_netrom.c | 2 +-
rose/af_rose.c | 2 +-
4 files changed, 2 insertions(+), 8 deletions(-)
diff -Nru a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
--- a/net/bluetooth/l2cap.c 2005-03-26 17:25:32 -08:00
+++ b/net/bluetooth/l2cap.c 2005-03-26 17:25:32 -08:00
@@ -264,9 +264,6 @@
skb_queue_purge(&sk->sk_receive_queue);
skb_queue_purge(&sk->sk_write_queue);
-
- if (sk->sk_protinfo)
- kfree(sk->sk_protinfo);
}
static void l2cap_sock_cleanup_listen(struct sock *parent)
diff -Nru a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
--- a/net/bluetooth/rfcomm/sock.c 2005-03-26 17:25:32 -08:00
+++ b/net/bluetooth/rfcomm/sock.c 2005-03-26 17:25:32 -08:00
@@ -196,9 +196,6 @@
rfcomm_dlc_unlock(d);
rfcomm_dlc_put(d);
-
- if (sk->sk_protinfo)
- kfree(sk->sk_protinfo);
}
static void rfcomm_sock_cleanup_listen(struct sock *parent)
diff -Nru a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
--- a/net/netrom/af_netrom.c 2005-03-26 17:25:32 -08:00
+++ b/net/netrom/af_netrom.c 2005-03-26 17:25:32 -08:00
@@ -925,7 +925,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:25:32 -08:00
+++ b/net/rose/af_rose.c 2005-03-26 17:25:32 -08:00
@@ -941,7 +941,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;
-
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
