sctp: reduce memory footprint of sctp_chunk structure

sctp_chunks should be put on a diet.  This is some of the low hanging
fruit that we can strip out.  Changes all the __s8/__u8 flags to
bitfields.  Saves 12 bytes per chunk.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 225c7123c41f..c3f417f7ec6e 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -699,7 +699,7 @@ static sctp_xmit_t sctp_packet_append_data(struct sctp_packet *packet,
          *    When a Fast Retransmit is being performed the sender SHOULD
          *    ignore the value of cwnd and SHOULD NOT delay retransmission.
          */
-        if (chunk->fast_retransmit <= 0)
+        if (chunk->fast_retransmit != SCTP_NEED_FRTX)
                 if (transport->flight_size >= transport->cwnd) {
                         retval = SCTP_XMIT_RWND_FULL;
                         goto finish;
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index da8d846301c1..247ebc95c1e5 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -420,7 +420,7 @@ void sctp_retransmit_mark(struct sctp_outq *q,
                  * be added to the retransmit queue.
                  */
                 if ((reason == SCTP_RTXR_FAST_RTX  &&
-                            (chunk->fast_retransmit > 0)) ||
+                            (chunk->fast_retransmit == SCTP_NEED_FRTX)) ||
                     (reason != SCTP_RTXR_FAST_RTX  && !chunk->tsn_gap_acked)) {
                         /* If this chunk was sent less then 1 rto ago, do not
                          * retransmit this chunk, but give the peer time
@@ -650,8 +650,8 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
                         /* Mark the chunk as ineligible for fast retransmit
                          * after it is retransmitted.
                          */
-                        if (chunk->fast_retransmit > 0)
-                                chunk->fast_retransmit = -1;
+                        if (chunk->fast_retransmit == SCTP_NEED_FRTX)
+                                chunk->fast_retransmit = SCTP_DONT_FRTX;
 
                         /* Force start T3-rtx timer when fast retransmitting
                          * the earliest outstanding TSN
@@ -680,8 +680,8 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
          */
         if (rtx_timeout || fast_rtx) {
                 list_for_each_entry(chunk1, lqueue, transmitted_list) {
-                        if (chunk1->fast_retransmit > 0)
-                                chunk1->fast_retransmit = -1;
+                        if (chunk1->fast_retransmit == SCTP_NEED_FRTX)
+                                chunk1->fast_retransmit = SCTP_DONT_FRTX;
                 }
         }
 
@@ -1656,7 +1656,7 @@ static void sctp_mark_missing(struct sctp_outq *q,
                  * chunk if it has NOT been fast retransmitted or marked for
                  * fast retransmit already.
                  */
-                if (!chunk->fast_retransmit &&
+                if (chunk->fast_retransmit == SCTP_CAN_FRTX &&
                     !chunk->tsn_gap_acked &&
                     TSN_lt(tsn, highest_new_tsn_in_sack)) {
 
@@ -1681,7 +1681,7 @@ static void sctp_mark_missing(struct sctp_outq *q,
                  */
 
                 if (chunk->tsn_missing_report >= 3) {
-                        chunk->fast_retransmit = 1;
+                        chunk->fast_retransmit = SCTP_NEED_FRTX;
                         do_fast_retransmit = 1;
                 }
         }
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index d68869f966c3..99fe0747cc96 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1211,7 +1211,7 @@ struct sctp_chunk *sctp_chunkify(struct sk_buff *skb,
          */
         retval->tsn_missing_report = 0;
         retval->tsn_gap_acked = 0;
-        retval->fast_retransmit = 0;
+        retval->fast_retransmit = SCTP_CAN_FRTX;
 
         /* If this is a fragmented message, track all fragments
          * of the message (for SEND_FAILED).