Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

[karo-tx-linux.git] / net / sctp / output.c

diff --git a/net/sctp/output.c b/net/sctp/output.c
index bbef4a7a9b569f1d639bf0fe4b2bbef8a5296951..a46d1eb41762801e2d95011bf3af8327c57ebac2 100644 (file)
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -93,8 +93,7 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet,
 {
        struct sctp_chunk *chunk = NULL;
 
-       SCTP_DEBUG_PRINTK("%s: packet:%p vtag:0x%x\n", __func__,
-                         packet, vtag);
+       pr_debug("%s: packet:%p vtag:0x%x\n", __func__, packet, vtag);
 
        packet->vtag = vtag;
 
@@ -119,8 +118,7 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *packet,
        struct sctp_association *asoc = transport->asoc;
        size_t overhead;
 
-       SCTP_DEBUG_PRINTK("%s: packet:%p transport:%p\n", __func__,
-                         packet, transport);
+       pr_debug("%s: packet:%p transport:%p\n", __func__, packet, transport);
 
        packet->transport = transport;
        packet->source_port = sport;
@@ -145,7 +143,7 @@ void sctp_packet_free(struct sctp_packet *packet)
 {
        struct sctp_chunk *chunk, *tmp;
 
-       SCTP_DEBUG_PRINTK("%s: packet:%p\n", __func__, packet);
+       pr_debug("%s: packet:%p\n", __func__, packet);
 
        list_for_each_entry_safe(chunk, tmp, &packet->chunk_list, list) {
                list_del_init(&chunk->list);
@@ -167,8 +165,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
        sctp_xmit_t retval;
        int error = 0;
 
-       SCTP_DEBUG_PRINTK("%s: packet:%p chunk:%p\n", __func__,
-                         packet, chunk);
+       pr_debug("%s: packet:%p chunk:%p\n", __func__, packet, chunk);
 
        switch ((retval = (sctp_packet_append_chunk(packet, chunk)))) {
        case SCTP_XMIT_PMTU_FULL:
@@ -334,8 +331,7 @@ sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *packet,
 {
        sctp_xmit_t retval = SCTP_XMIT_OK;
 
-       SCTP_DEBUG_PRINTK("%s: packet:%p chunk:%p\n", __func__, packet,
-                         chunk);
+       pr_debug("%s: packet:%p chunk:%p\n", __func__, packet, chunk);
 
        /* Data chunks are special.  Before seeing what else we can
         * bundle into this packet, check to see if we are allowed to
@@ -402,7 +398,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
        unsigned char *auth = NULL;     /* pointer to auth in skb data */
        __u32 cksum_buf_len = sizeof(struct sctphdr);
 
-       SCTP_DEBUG_PRINTK("%s: packet:%p\n", __func__, packet);
+       pr_debug("%s: packet:%p\n", __func__, packet);
 
        /* Do NOT generate a chunkless packet. */
        if (list_empty(&packet->chunk_list))
@@ -472,7 +468,9 @@ int sctp_packet_transmit(struct sctp_packet *packet)
         *
         * [This whole comment explains WORD_ROUND() below.]
         */
-       SCTP_DEBUG_PRINTK("***sctp_transmit_packet***\n");
+
+       pr_debug("***sctp_transmit_packet***\n");
+
        list_for_each_entry_safe(chunk, tmp, &packet->chunk_list, list) {
                list_del_init(&chunk->list);
                if (sctp_chunk_is_data(chunk)) {
@@ -505,16 +503,13 @@ int sctp_packet_transmit(struct sctp_packet *packet)
                memcpy(skb_put(nskb, chunk->skb->len),
                               chunk->skb->data, chunk->skb->len);
 
-               SCTP_DEBUG_PRINTK("%s %p[%s] %s 0x%x, %s %d, %s %d, %s %d\n",
-                                 "*** Chunk", chunk,
-                                 sctp_cname(SCTP_ST_CHUNK(
-                                         chunk->chunk_hdr->type)),
-                                 chunk->has_tsn ? "TSN" : "No TSN",
-                                 chunk->has_tsn ?
-                                 ntohl(chunk->subh.data_hdr->tsn) : 0,
-                                 "length", ntohs(chunk->chunk_hdr->length),
-                                 "chunk->skb->len", chunk->skb->len,
-                                 "rtt_in_progress", chunk->rtt_in_progress);
+               pr_debug("*** Chunk:%p[%s] %s 0x%x, length:%d, chunk->skb->len:%d, "
+                        "rtt_in_progress:%d\n", chunk,
+                        sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)),
+                        chunk->has_tsn ? "TSN" : "No TSN",
+                        chunk->has_tsn ? ntohl(chunk->subh.data_hdr->tsn) : 0,
+                        ntohs(chunk->chunk_hdr->length), chunk->skb->len,
+                        chunk->rtt_in_progress);
 
                /*
                 * If this is a control chunk, this is our last
@@ -606,8 +601,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
                }
        }
 
-       SCTP_DEBUG_PRINTK("***sctp_transmit_packet*** skb len %d\n",
-                         nskb->len);
+       pr_debug("***sctp_transmit_packet*** skb->len:%d\n", nskb->len);
 
        nskb->local_df = packet->ipfragok;
        (*tp->af_specific->sctp_xmit)(nskb, tp);