diff for duplicates of <1252067108.6172.4.camel@localhost> diff --git a/a/1.txt b/N1/1.txt index a208ccc..2e88417 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,8 @@ Signed-off-by: Ivo Calado, Erivaldo Xavier, Leandro Sales <leandroal@gmail.com> Index: dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.c -=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.c +=================================================================== +--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.c 2009-09-03 23:10:05.000000000 -0300 +++ dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.c 2009-09-04 00:10:24.000000000 -0300 @@ -114,7 +115,8 @@ __three_after_loss(h); * Update moving-average of `s' and the sum of received payload bytes. */ Index: dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.c -=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.c +=================================================================== +--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.c 2009-09-03 23:10:05.000000000 -0300 +++ dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.c 2009-09-04 00:28:03.000000000 -0300 @@ -137,9 +139,10 @@ static const int tfrc_lh_weights[NINTERVAL] = { 10, 10, 10, 10, 8, 6, 4, +static struct tfrc_loss_data_entry *tfrc_ld_add_new(struct tfrc_loss_data *ld) +{ -+ struct tfrc_loss_data_entry *new + kmem_cache_alloc(tfrc_ld_slab, GFP_ATOMIC); ++ struct tfrc_loss_data_entry *new = ++ kmem_cache_alloc(tfrc_ld_slab, GFP_ATOMIC); + -+ if (new = NULL) ++ if (new == NULL) + return NULL; + + memset(new, 0, sizeof(struct tfrc_loss_data_entry)); @@ -219,9 +222,9 @@ tfrc_loss_data *ld) + if (!dccp_data_packet(skb)) + return; + -+ if (ld->head = NULL) { ++ if (ld->head == NULL) { + new = tfrc_ld_add_new(ld); -+ if (unlikely(new = NULL)) { ++ if (unlikely(new == NULL)) { + DCCP_CRIT("Cannot allocate new loss data registry."); + return; + } @@ -257,7 +260,7 @@ tfrc_loss_data *ld) + + if (new_event) { + new = tfrc_ld_add_new(ld); -+ if (unlikely(new = NULL)) { ++ if (unlikely(new == NULL)) { + DCCP_CRIT("Cannot allocate new loss data registry. \ + Cleaning up."); + tfrc_sp_ld_cleanup(ld); @@ -278,7 +281,8 @@ tfrc_loss_data *ld) + new->data_length++; + + if (ld->sto_ecn & (1 << (ld->last_loss_count))) -+ new->ecn_nonce_sum + !new->ecn_nonce_sum; ++ new->ecn_nonce_sum = ++ !new->ecn_nonce_sum; + } + } + @@ -388,7 +392,8 @@ tfrc_lh_slab = NULL; + } } Index: dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.h -=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.h +=================================================================== +--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.h 2009-09-03 23:00:31.000000000 -0300 +++ dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.h 2009-09-04 00:19:53.000000000 -0300 @@ -447,7 +452,8 @@ tfrc_loss_data *ld); #endif /* _DCCP_LI_HIST_SP_ */ Index: dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.h -=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.h +=================================================================== +--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.h 2009-09-03 22:58:29.000000000 -0300 +++ dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.h 2009-09-03 23:38:22.000000000 -0300 @@ -460,7 +466,8 @@ extern bool tfrc_sp_rx_congestion_event(struct tfrc_rx_hist *h, u32 (*first_li)(struct sock *sk), struct sock *sk); Index: dccp_tree_work4/net/dccp/ccids/lib/tfrc_ccids_sp.h -=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/tfrc_ccids_sp.h 2009-09-03 +=================================================================== +--- dccp_tree_work4.orig/net/dccp/ccids/lib/tfrc_ccids_sp.h 2009-09-03 21:56:15.000000000 -0300 +++ dccp_tree_work4/net/dccp/ccids/lib/tfrc_ccids_sp.h 2009-09-03 23:34:40.000000000 -0300 @@ -481,22 +488,23 @@ struct tfrc_loss_hist li_hist; }; Index: dccp_tree_work4/net/dccp/dccp.h -=================================--- dccp_tree_work4.orig/net/dccp/dccp.h 2009-09-03 22:58:29.000000000 +=================================================================== +--- dccp_tree_work4.orig/net/dccp/dccp.h 2009-09-03 22:58:29.000000000 -0300 +++ dccp_tree_work4/net/dccp/dccp.h 2009-09-03 23:42:04.000000000 -0300 @@ -403,6 +403,16 @@ -return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) = INET_ECN_CE; +return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) == INET_ECN_CE; } +static inline bool dccp_skb_is_ecn_ect0(const struct sk_buff *skb) +{ -+ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) = ++ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) == INET_ECN_ECT_0; +} + +static inline bool dccp_skb_is_ecn_ect1(const struct sk_buff *skb) +{ -+ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) = ++ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) == INET_ECN_ECT_0; +} + diff --git a/a/content_digest b/N1/content_digest index e05046b..ddb9e13 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ - "ref\0cb00fa210909011945u2d82da97i7a7f2d1f12519a5f@mail.gmail.com\0" "From\0Ivo Calado <ivocalado@embedded.ufcg.edu.br>\0" - "Subject\0[PATCH 4/5] Adds options DROPPED PACKETS and LOSS INTERVALS to\0" - "Date\0Fri, 04 Sep 2009 12:25:08 +0000\0" + "Subject\0[PATCH 4/5] Adds options DROPPED PACKETS and LOSS INTERVALS to receiver\0" + "Date\0Fri, 04 Sep 2009 09:25:08 -0300\0" "To\0dccp@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org\0" "\00:1\0" "b\0" "Adds options DROPPED PACKETS and LOSS INTERVALS to receiver. In this\n" @@ -29,7 +29,8 @@ "<leandroal@gmail.com>\n" "\n" "Index: dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.c\n" - "=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.c\n" + "===================================================================\n" + "--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.c\n" "2009-09-03 23:10:05.000000000 -0300\n" "+++ dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.c 2009-09-04\n" "00:10:24.000000000 -0300\n" @@ -121,7 +122,8 @@ "* Update moving-average of `s' and the sum of received payload bytes.\n" "*/\n" "Index: dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.c\n" - "=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.c\n" + "===================================================================\n" + "--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.c\n" "2009-09-03 23:10:05.000000000 -0300\n" "+++ dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.c 2009-09-04\n" "00:28:03.000000000 -0300\n" @@ -144,9 +146,10 @@ "+static struct tfrc_loss_data_entry *tfrc_ld_add_new(struct\n" "tfrc_loss_data *ld)\n" "+{\n" - "+ struct tfrc_loss_data_entry *new + kmem_cache_alloc(tfrc_ld_slab, GFP_ATOMIC);\n" + "+ struct tfrc_loss_data_entry *new =\n" + "+ kmem_cache_alloc(tfrc_ld_slab, GFP_ATOMIC);\n" "+\n" - "+ if (new = NULL)\n" + "+ if (new == NULL)\n" "+ return NULL;\n" "+\n" "+ memset(new, 0, sizeof(struct tfrc_loss_data_entry));\n" @@ -226,9 +229,9 @@ "+ if (!dccp_data_packet(skb))\n" "+ return;\n" "+\n" - "+ if (ld->head = NULL) {\n" + "+ if (ld->head == NULL) {\n" "+ new = tfrc_ld_add_new(ld);\n" - "+ if (unlikely(new = NULL)) {\n" + "+ if (unlikely(new == NULL)) {\n" "+ DCCP_CRIT(\"Cannot allocate new loss data registry.\");\n" "+ return;\n" "+ }\n" @@ -264,7 +267,7 @@ "+\n" "+ if (new_event) {\n" "+ new = tfrc_ld_add_new(ld);\n" - "+ if (unlikely(new = NULL)) {\n" + "+ if (unlikely(new == NULL)) {\n" "+ DCCP_CRIT(\"Cannot allocate new loss data registry. \\\n" "+ Cleaning up.\");\n" "+ tfrc_sp_ld_cleanup(ld);\n" @@ -285,7 +288,8 @@ "+ new->data_length++;\n" "+\n" "+ if (ld->sto_ecn & (1 << (ld->last_loss_count)))\n" - "+ new->ecn_nonce_sum + !new->ecn_nonce_sum;\n" + "+ new->ecn_nonce_sum =\n" + "+ !new->ecn_nonce_sum;\n" "+ }\n" "+ }\n" "+\n" @@ -395,7 +399,8 @@ "+ }\n" "}\n" "Index: dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.h\n" - "=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.h\n" + "===================================================================\n" + "--- dccp_tree_work4.orig/net/dccp/ccids/lib/loss_interval_sp.h\n" "2009-09-03 23:00:31.000000000 -0300\n" "+++ dccp_tree_work4/net/dccp/ccids/lib/loss_interval_sp.h 2009-09-04\n" "00:19:53.000000000 -0300\n" @@ -454,7 +459,8 @@ "\n" "#endif /* _DCCP_LI_HIST_SP_ */\n" "Index: dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.h\n" - "=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.h\n" + "===================================================================\n" + "--- dccp_tree_work4.orig/net/dccp/ccids/lib/packet_history_sp.h\n" "2009-09-03 22:58:29.000000000 -0300\n" "+++ dccp_tree_work4/net/dccp/ccids/lib/packet_history_sp.h 2009-09-03\n" "23:38:22.000000000 -0300\n" @@ -467,7 +473,8 @@ " u32 (*first_li)(struct sock *sk),\n" " struct sock *sk);\n" "Index: dccp_tree_work4/net/dccp/ccids/lib/tfrc_ccids_sp.h\n" - "=================================--- dccp_tree_work4.orig/net/dccp/ccids/lib/tfrc_ccids_sp.h 2009-09-03\n" + "===================================================================\n" + "--- dccp_tree_work4.orig/net/dccp/ccids/lib/tfrc_ccids_sp.h 2009-09-03\n" "21:56:15.000000000 -0300\n" "+++ dccp_tree_work4/net/dccp/ccids/lib/tfrc_ccids_sp.h 2009-09-03\n" "23:34:40.000000000 -0300\n" @@ -488,22 +495,23 @@ "};\n" "\n" "Index: dccp_tree_work4/net/dccp/dccp.h\n" - "=================================--- dccp_tree_work4.orig/net/dccp/dccp.h 2009-09-03 22:58:29.000000000\n" + "===================================================================\n" + "--- dccp_tree_work4.orig/net/dccp/dccp.h 2009-09-03 22:58:29.000000000\n" "-0300\n" "+++ dccp_tree_work4/net/dccp/dccp.h 2009-09-03 23:42:04.000000000 -0300\n" "@@ -403,6 +403,16 @@\n" - "return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) = INET_ECN_CE;\n" + "return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) == INET_ECN_CE;\n" "}\n" "\n" "+static inline bool dccp_skb_is_ecn_ect0(const struct sk_buff *skb)\n" "+{\n" - "+ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) =\n" + "+ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) ==\n" "INET_ECN_ECT_0;\n" "+}\n" "+\n" "+static inline bool dccp_skb_is_ecn_ect1(const struct sk_buff *skb)\n" "+{\n" - "+ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) =\n" + "+ return (DCCP_SKB_CB(skb)->dccpd_ecn & INET_ECN_MASK) ==\n" "INET_ECN_ECT_0;\n" "+}\n" "+\n" @@ -511,4 +519,4 @@ "static inline int dccp_non_data_packet(const struct sk_buff *skb)\n" { -22c775bcfd018fe0f729f53a216d296e40d9ca8c1b436cf9f9f3ac3fef863bfb +940d92951cc8b0eb362ad7e11a573e88632d0324acabdb4dc2123c3a1ce81fcb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.