Merge /spare/repo/netdev-2.6/ branch 'ieee80211'

[linux-2.6] / net / sctp / outqueue.c

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 1b2d4adc4ddbaf013e802d8e1da8df756d395e77..4eb81a1407b7e027c7da1302a8af43705be3015a 100644 (file)
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -682,9 +682,9 @@ int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
 
                if (!new_transport) {
                        new_transport = asoc->peer.active_path;
-               } else if (!new_transport->active) {
-                       /* If the chunk is Heartbeat or Heartbeat Ack, 
-                        * send it to chunk->transport, even if it's 
+               } else if (new_transport->state == SCTP_INACTIVE) {
+                       /* If the chunk is Heartbeat or Heartbeat Ack,
+                        * send it to chunk->transport, even if it's
                         * inactive.
                         *
                         * 3.3.6 Heartbeat Acknowledgement:
@@ -840,7 +840,8 @@ int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
                         * Otherwise, we want to use the active path.
                         */
                        new_transport = chunk->transport;
-                       if (!new_transport || !new_transport->active)
+                       if (!new_transport ||
+                           new_transport->state == SCTP_INACTIVE)
                                new_transport = asoc->peer.active_path;
 
                        /* Change packets if necessary.  */
@@ -1454,7 +1455,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
                        /* Mark the destination transport address as
                         * active if it is not so marked.
                         */
-                       if (!transport->active) {
+                       if (transport->state == SCTP_INACTIVE) {
                                sctp_assoc_control_transport(
                                        transport->asoc,
                                        transport,