Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [IPV4]: Restore multipath routing after rt_next changes.
  [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
  [NET]: Reorder fields of struct dst_entry
  [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
  [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
  [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
  [NET]: Introduce union in struct dst_entry to hold 'next' pointer
  [DECNET]: fix misannotation of linkinfo_dn
  [DECNET]: FRA_{DST,SRC} are le16 for decnet
  [UDP]: UDP can use sk_hash to speedup lookups
  [NET]: Fix whitespace errors.
  [NET] XFRM: Fix whitespace errors.
  [NET] X25: Fix whitespace errors.
  [NET] WANROUTER: Fix whitespace errors.
  [NET] UNIX: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] SCHED: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 3ef4351dd956..f875fc3ced54 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -85,8 +85,8 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet,
                 chunk = sctp_get_ecne_prepend(packet->transport->asoc);
 
                 /* If there a is a prepend chunk stick it on the list before
-                 * any other chunks get appended.
-                 */
+                 * any other chunks get appended.
+                 */
                 if (chunk)
                         sctp_packet_append_chunk(packet, chunk);
         }
@@ -110,8 +110,8 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *packet,
         packet->destination_port = dport;
         INIT_LIST_HEAD(&packet->chunk_list);
         if (asoc) {
-                struct sctp_sock *sp = sctp_sk(asoc->base.sk);  
-                overhead = sp->pf->af->net_header_len; 
+                struct sctp_sock *sp = sctp_sk(asoc->base.sk);
+                overhead = sp->pf->af->net_header_len;
         } else {
                 overhead = sizeof(struct ipv6hdr);
         }
@@ -442,7 +442,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
                  * acknowledged or have failed.
                  */
                 if (!sctp_chunk_is_data(chunk))
-                        sctp_chunk_free(chunk);
+                        sctp_chunk_free(chunk);
         }
 
         /* Perform final transformation on checksum. */
@@ -528,7 +528,7 @@ err:
         list_for_each_entry_safe(chunk, tmp, &packet->chunk_list, list) {
                 list_del_init(&chunk->list);
                 if (!sctp_chunk_is_data(chunk))
-                        sctp_chunk_free(chunk);
+                        sctp_chunk_free(chunk);
         }
         goto out;
 nomem: