net: return operator cleanup

[cascardo/linux.git] / include / net / sctp / tsnmap.h

diff --git a/include/net/sctp/tsnmap.h b/include/net/sctp/tsnmap.h
index 099211b..e7728bc 100644 (file)
--- a/include/net/sctp/tsnmap.h
+++ b/include/net/sctp/tsnmap.h
@@ -60,18 +60,7 @@ struct sctp_tsnmap {
         * It points at one of the two buffers with which we will
         * ping-pong between.
         */
-       __u8 *tsn_map;
-
-       /* This marks the tsn which overflows the tsn_map, when the
-        * cumulative ack point reaches this point we know we can switch
-        * maps (tsn_map and overflow_map swap).
-        */
-       __u32 overflow_tsn;
-
-       /* This is the overflow array for tsn_map.
-        * It points at one of the other ping-pong buffers.
-        */
-       __u8 *overflow_map;
+       unsigned long *tsn_map;
 
        /* This is the TSN at tsn_map[0].  */
        __u32 base_tsn;
@@ -89,15 +78,15 @@ struct sctp_tsnmap {
         */
        __u32 cumulative_tsn_ack_point;
 
+       /* This is the highest TSN we've marked.  */
+       __u32 max_tsn_seen;
+
        /* This is the minimum number of TSNs we can track.  This corresponds
         * to the size of tsn_map.   Note: the overflow_map allows us to
         * potentially track more than this quantity.
         */
        __u16 len;
 
-       /* This is the highest TSN we've marked.  */
-       __u32 max_tsn_seen;
-
        /* Data chunks pending receipt. used by SCTP_STATUS sockopt */
        __u16 pending_data;
 
@@ -105,29 +94,19 @@ struct sctp_tsnmap {
         * every SACK.  Store up to SCTP_MAX_DUP_TSNS worth of
         * information.
         */
-       __be32 dup_tsns[SCTP_MAX_DUP_TSNS];
        __u16 num_dup_tsns;
-
-       /* Record gap ack block information here.  */
-       struct sctp_gap_ack_block gabs[SCTP_MAX_GABS];
-
-       int malloced;
-
-       __u8 raw_map[0];
+       __be32 dup_tsns[SCTP_MAX_DUP_TSNS];
 };
 
 struct sctp_tsnmap_iter {
        __u32 start;
 };
 
-/* This macro assists in creation of external storage for variable length
- * internal buffers.  We double allocate so the overflow map works.
- */
-#define sctp_tsnmap_storage_size(count) (sizeof(__u8) * (count) * 2)
-
 /* Initialize a block of memory as a tsnmap.  */
 struct sctp_tsnmap *sctp_tsnmap_init(struct sctp_tsnmap *, __u16 len,
-                                    __u32 initial_tsn);
+                                    __u32 initial_tsn, gfp_t gfp);
+
+void sctp_tsnmap_free(struct sctp_tsnmap *map);
 
 /* Test the tracking state of this TSN.
  * Returns:
@@ -138,7 +117,7 @@ struct sctp_tsnmap *sctp_tsnmap_init(struct sctp_tsnmap *, __u16 len,
 int sctp_tsnmap_check(const struct sctp_tsnmap *, __u32 tsn);
 
 /* Mark this TSN as seen.  */
-void sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn);
+int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn);
 
 /* Mark this TSN and all lower as seen. */
 void sctp_tsnmap_skip(struct sctp_tsnmap *map, __u32 tsn);
@@ -169,24 +148,16 @@ static inline __be32 *sctp_tsnmap_get_dups(struct sctp_tsnmap *map)
 }
 
 /* How many gap ack blocks do we have recorded? */
-__u16 sctp_tsnmap_num_gabs(struct sctp_tsnmap *map);
+__u16 sctp_tsnmap_num_gabs(struct sctp_tsnmap *map,
+                          struct sctp_gap_ack_block *gabs);
 
 /* Refresh the count on pending data. */
 __u16 sctp_tsnmap_pending(struct sctp_tsnmap *map);
 
-/* Return pointer to gap ack blocks as needed by SACK. */
-static inline struct sctp_gap_ack_block *sctp_tsnmap_get_gabs(struct sctp_tsnmap *map)
-{
-       return map->gabs;
-}
-
 /* Is there a gap in the TSN map?  */
 static inline int sctp_tsnmap_has_gap(const struct sctp_tsnmap *map)
 {
-       int has_gap;
-
-       has_gap = (map->cumulative_tsn_ack_point != map->max_tsn_seen);
-       return has_gap;
+       return map->cumulative_tsn_ack_point != map->max_tsn_seen;
 }
 
 /* Mark a duplicate TSN.  Note:  limit the storage of duplicate TSN