[DCCP] ccid: Deprecate ccid_hc_tx_insert_options

 The function ccid3_hc_tx_insert_options only does a redundant no-op,
 as the operation

  DCCP_SKB_CB(skb)->dccpd_ccval = hctx->ccid3hctx_last_win_count;

 is already performed _unconditionally_ in ccid3_hc_tx_send_packet.

 Since there is further no current need for this function, it is removed
 entirely. Since furthermore, there is actually no present need for the
 entire interface function ccid_hc_tx_insert_options, it was decided to
 remove it also, to clean up the interface.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

1 files changed, 0 insertions, 5 deletions

diff --git a/net/dccp/options.c b/net/dccp/options.c
index f398b43bc055..c03ba61eb6da 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -557,11 +557,6 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
                         return -1;
                 dp->dccps_hc_rx_insert_options = 0;
         }
-        if (dp->dccps_hc_tx_insert_options) {
-                if (ccid_hc_tx_insert_options(dp->dccps_hc_tx_ccid, sk, skb))
-                        return -1;
-                dp->dccps_hc_tx_insert_options = 0;
-        }
 
         /* Feature negotiation */
         /* Data packets can't do feat negotiation */