[SCTP]: "list_for_each()" -> "list_for_each_entry()" where appropriate.

Replacing (almost) all invocations of list_for_each() with
list_for_each_entry() tightens up the code and allows for the deletion
of numerous list iterator variables that are no longer necessary.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 11 deletions

diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index ceefda025e2d..80e6df06967a 100644
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -67,15 +67,13 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest,
                         int flags)
 {
         struct sctp_sockaddr_entry *addr;
-        struct list_head *pos;
         int error = 0;
 
         /* All addresses share the same port.  */
         dest->port = src->port;
 
         /* Extract the addresses which are relevant for this scope.  */
-        list_for_each(pos, &src->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        list_for_each_entry(addr, &src->address_list, list) {
                 error = sctp_copy_one_addr(dest, &addr->a, scope,
                                            gfp, flags);
                 if (error < 0)
@@ -87,9 +85,7 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest,
          * the assumption that we must be sitting behind a NAT.
          */
         if (list_empty(&dest->address_list) && (SCTP_SCOPE_GLOBAL == scope)) {
-                list_for_each(pos, &src->address_list) {
-                        addr = list_entry(pos, struct sctp_sockaddr_entry,
-                                          list);
+                list_for_each_entry(addr, &src->address_list, list) {
                         error = sctp_copy_one_addr(dest, &addr->a,
                                                    SCTP_SCOPE_LINK, gfp,
                                                    flags);
@@ -115,14 +111,12 @@ int sctp_bind_addr_dup(struct sctp_bind_addr *dest,
                         gfp_t gfp)
 {
         struct sctp_sockaddr_entry *addr;
-        struct list_head *pos;
         int error = 0;
 
         /* All addresses share the same port.  */
         dest->port = src->port;
 
-        list_for_each(pos, &src->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        list_for_each_entry(addr, &src->address_list, list) {
                 error = sctp_add_bind_addr(dest, &addr->a, 1, gfp);
                 if (error < 0)
                         break;
@@ -273,8 +267,7 @@ union sctp_params sctp_bind_addrs_to_raw(const struct sctp_bind_addr *bp,
 
         addrparms = retval;
 
-        list_for_each(pos, &bp->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        list_for_each_entry(addr, &bp->address_list, list) {
                 af = sctp_get_af_specific(addr->a.v4.sin_family);
                 len = af->to_addr_param(&addr->a, &rawaddr);
                 memcpy(addrparms.v, &rawaddr, len);