1 files changed, 14 insertions, 20 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 422c98aa9d5c..b4cd2b71953f 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -718,12 +718,11 @@ struct sctp_transport *sctp_assoc_lookup_paddr(
                                         const union sctp_addr *address)
 {
         struct sctp_transport *t;
-        struct list_head *pos;
 
         /* Cycle through all transports searching for a peer address. */
 
-        list_for_each(pos, &asoc->peer.transport_addr_list) {
-                t = list_entry(pos, struct sctp_transport, transports);
+        list_for_each_entry(t, &asoc->peer.transport_addr_list,
+                        transports) {
                 if (sctp_cmp_addr_exact(address, &t->ipaddr))
                         return t;
         }
@@ -762,7 +761,6 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
         struct sctp_transport *second;
         struct sctp_ulpevent *event;
         struct sockaddr_storage addr;
-        struct list_head *pos;
         int spc_state = 0;
 
         /* Record the transition on the transport.  */
@@ -814,8 +812,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
          */
         first = NULL; second = NULL;
 
-        list_for_each(pos, &asoc->peer.transport_addr_list) {
-                t = list_entry(pos, struct sctp_transport, transports);
+        list_for_each_entry(t, &asoc->peer.transport_addr_list,
+                        transports) {
 
                 if ((t->state == SCTP_INACTIVE) ||
                     (t->state == SCTP_UNCONFIRMED))
@@ -932,7 +930,6 @@ struct sctp_transport *sctp_assoc_lookup_tsn(struct sctp_association *asoc,
 {
         struct sctp_transport *active;
         struct sctp_transport *match;
-        struct list_head *entry, *pos;
         struct sctp_transport *transport;
         struct sctp_chunk *chunk;
         __be32 key = htonl(tsn);
@@ -956,8 +953,8 @@ struct sctp_transport *sctp_assoc_lookup_tsn(struct sctp_association *asoc,
 
         active = asoc->peer.active_path;
 
-        list_for_each(entry, &active->transmitted) {
-                chunk = list_entry(entry, struct sctp_chunk, transmitted_list);
+        list_for_each_entry(chunk, &active->transmitted,
+                        transmitted_list) {
 
                 if (key == chunk->subh.data_hdr->tsn) {
                         match = active;
@@ -966,14 +963,13 @@ struct sctp_transport *sctp_assoc_lookup_tsn(struct sctp_association *asoc,
         }
 
         /* If not found, go search all the other transports. */
-        list_for_each(pos, &asoc->peer.transport_addr_list) {
-                transport = list_entry(pos, struct sctp_transport, transports);
+        list_for_each_entry(transport, &asoc->peer.transport_addr_list,
+                        transports) {
 
                 if (transport == active)
                         break;
-                list_for_each(entry, &transport->transmitted) {
-                        chunk = list_entry(entry, struct sctp_chunk,
-                                           transmitted_list);
+                list_for_each_entry(chunk, &transport->transmitted,
+                                transmitted_list) {
                         if (key == chunk->subh.data_hdr->tsn) {
                                 match = transport;
                                 goto out;
@@ -1154,9 +1150,8 @@ void sctp_assoc_update(struct sctp_association *asoc,
 
         } else {
                 /* Add any peer addresses from the new association. */
-                list_for_each(pos, &new->peer.transport_addr_list) {
-                        trans = list_entry(pos, struct sctp_transport,
-                                           transports);
+                list_for_each_entry(trans, &new->peer.transport_addr_list,
+                                transports) {
                         if (!sctp_assoc_lookup_paddr(asoc, &trans->ipaddr))
                                 sctp_assoc_add_peer(asoc, &trans->ipaddr,
                                                     GFP_ATOMIC, trans->state);
@@ -1306,15 +1301,14 @@ struct sctp_transport *sctp_assoc_choose_shutdown_transport(
 void sctp_assoc_sync_pmtu(struct sctp_association *asoc)
 {
         struct sctp_transport *t;
-        struct list_head *pos;
         __u32 pmtu = 0;
 
         if (!asoc)
                 return;
 
         /* Get the lowest pmtu of all the transports. */
-        list_for_each(pos, &asoc->peer.transport_addr_list) {
-                t = list_entry(pos, struct sctp_transport, transports);
+        list_for_each_entry(t, &asoc->peer.transport_addr_list,
+                                transports) {
                 if (t->pmtu_pending && t->dst) {
                         sctp_transport_update_pmtu(t, dst_mtu(t->dst));
                         t->pmtu_pending = 0;