[DCCP]: Nuke dccp_timestamp and dccps_epoch, not used anymore
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>hifive-unleashed-5.1
parent
234748954a
commit
8fb8354af9
|
@ -512,7 +512,6 @@ struct dccp_sock {
|
||||||
struct ccid *dccps_hc_rx_ccid;
|
struct ccid *dccps_hc_rx_ccid;
|
||||||
struct ccid *dccps_hc_tx_ccid;
|
struct ccid *dccps_hc_tx_ccid;
|
||||||
struct dccp_options_received dccps_options_received;
|
struct dccp_options_received dccps_options_received;
|
||||||
struct timeval dccps_epoch;
|
|
||||||
enum dccp_role dccps_role:2;
|
enum dccp_role dccps_role:2;
|
||||||
__u8 dccps_hc_rx_insert_options:1;
|
__u8 dccps_hc_rx_insert_options:1;
|
||||||
__u8 dccps_hc_tx_insert_options:1;
|
__u8 dccps_hc_tx_insert_options:1;
|
||||||
|
|
|
@ -402,8 +402,6 @@ extern int dccp_insert_option(struct sock *sk, struct sk_buff *skb,
|
||||||
unsigned char option,
|
unsigned char option,
|
||||||
const void *value, unsigned char len);
|
const void *value, unsigned char len);
|
||||||
|
|
||||||
extern void dccp_timestamp(const struct sock *sk, struct timeval *tv);
|
|
||||||
|
|
||||||
static inline suseconds_t timeval_usecs(const struct timeval *tv)
|
static inline suseconds_t timeval_usecs(const struct timeval *tv)
|
||||||
{
|
{
|
||||||
return tv->tv_sec * USEC_PER_SEC + tv->tv_usec;
|
return tv->tv_sec * USEC_PER_SEC + tv->tv_usec;
|
||||||
|
|
|
@ -112,7 +112,6 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
|
||||||
newdp->dccps_service_list = NULL;
|
newdp->dccps_service_list = NULL;
|
||||||
newdp->dccps_service = dreq->dreq_service;
|
newdp->dccps_service = dreq->dreq_service;
|
||||||
newicsk->icsk_rto = DCCP_TIMEOUT_INIT;
|
newicsk->icsk_rto = DCCP_TIMEOUT_INIT;
|
||||||
do_gettimeofday(&newdp->dccps_epoch);
|
|
||||||
|
|
||||||
if (dccp_feat_clone(sk, newsk))
|
if (dccp_feat_clone(sk, newsk))
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
|
@ -370,22 +370,6 @@ int dccp_insert_option_elapsed_time(struct sock *sk, struct sk_buff *skb,
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);
|
EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);
|
||||||
|
|
||||||
void dccp_timestamp(const struct sock *sk, struct timeval *tv)
|
|
||||||
{
|
|
||||||
const struct dccp_sock *dp = dccp_sk(sk);
|
|
||||||
|
|
||||||
do_gettimeofday(tv);
|
|
||||||
tv->tv_sec -= dp->dccps_epoch.tv_sec;
|
|
||||||
tv->tv_usec -= dp->dccps_epoch.tv_usec;
|
|
||||||
|
|
||||||
while (tv->tv_usec < 0) {
|
|
||||||
tv->tv_sec--;
|
|
||||||
tv->tv_usec += USEC_PER_SEC;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(dccp_timestamp);
|
|
||||||
|
|
||||||
int dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb)
|
int dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
__be32 now = htonl(((suseconds_t)ktime_to_us(ktime_get_real())) / 10);
|
__be32 now = htonl(((suseconds_t)ktime_to_us(ktime_get_real())) / 10);
|
||||||
|
|
|
@ -172,7 +172,6 @@ int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized)
|
||||||
struct inet_connection_sock *icsk = inet_csk(sk);
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
||||||
|
|
||||||
dccp_minisock_init(&dp->dccps_minisock);
|
dccp_minisock_init(&dp->dccps_minisock);
|
||||||
do_gettimeofday(&dp->dccps_epoch);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FIXME: We're hardcoding the CCID, and doing this at this point makes
|
* FIXME: We're hardcoding the CCID, and doing this at this point makes
|
||||||
|
|
Loading…
Reference in New Issue