[PATCH 4/9] DCCP: Simplify dccp_li_hist_entry_new

[Ian McDonald]

This simplifies dccp_li_hist_entry_new.

Signed-off-by: Ian McDonald <[EMAIL PROTECTED]>
---
diff --git a/net/dccp/ccids/lib/loss_interval.c 
b/net/dccp/ccids/lib/loss_interval.c
index ea5da09..d41bc58 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -21,11 +21,9 @@
 
 static struct dccp_li_hist *ccid3_li_hist;
 
-static inline struct dccp_li_hist_entry *
-               dccp_li_hist_entry_new(struct dccp_li_hist *hist,
-                                      const gfp_t prio)
+static inline struct dccp_li_hist_entry *dccp_li_hist_entry_new(void)
 {
-       return kmem_cache_alloc(hist->dccplih_slab, prio);
+       return kmem_cache_alloc(ccid3_li_hist->dccplih_slab, GFP_ATOMIC);
 }
 
 static inline void dccp_li_hist_entry_delete(struct dccp_li_hist *hist,
@@ -142,7 +140,7 @@ static int dccp_li_hist_interval_new(struct dccp_li_hist 
*hist,
        int i;
 
        for (i = 0; i < DCCP_LI_HIST_IVAL_F_LENGTH; i++) {
-               entry = dccp_li_hist_entry_new(hist, GFP_ATOMIC);
+               entry = dccp_li_hist_entry_new();
                if (entry == NULL) {
                        dccp_li_hist_purge(list);
                        DCCP_BUG("loss interval list entry is NULL");
@@ -287,7 +285,7 @@ void ccid3_hc_rx_update_li(struct sock *sk, u64 seq_loss, 
u8 win_loss)
                /* new loss event detected */
                /* calculate last interval length */
                seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss);
-               entry = dccp_li_hist_entry_new(ccid3_li_hist, GFP_ATOMIC);
+               entry = dccp_li_hist_entry_new();
 
                if (entry == NULL) {
                        DCCP_BUG("out of memory - can not allocate entry");
-
To unsubscribe from this list: send the line "unsubscribe dccp" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html