aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/options.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r--net/dccp/options.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c
index debb1008c7ad..e9d674874b4e 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -27,7 +27,6 @@ int sysctl_dccp_feat_sequence_window = DCCPF_INITIAL_SEQUENCE_WINDOW;
27int sysctl_dccp_feat_rx_ccid = DCCPF_INITIAL_CCID; 27int sysctl_dccp_feat_rx_ccid = DCCPF_INITIAL_CCID;
28int sysctl_dccp_feat_tx_ccid = DCCPF_INITIAL_CCID; 28int sysctl_dccp_feat_tx_ccid = DCCPF_INITIAL_CCID;
29int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR; 29int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR;
30int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT;
31 30
32u64 dccp_decode_value_var(const u8 *bf, const u8 len) 31u64 dccp_decode_value_var(const u8 *bf, const u8 len)
33{ 32{
@@ -531,8 +530,7 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
531 530
532 DCCP_SKB_CB(skb)->dccpd_opt_len = 0; 531 DCCP_SKB_CB(skb)->dccpd_opt_len = 0;
533 532
534 if (dmsk->dccpms_send_ndp_count && 533 if (dp->dccps_send_ndp_count && dccp_insert_option_ndp(sk, skb))
535 dccp_insert_option_ndp(sk, skb))
536 return -1; 534 return -1;
537 535
538 if (DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATA) { 536 if (DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATA) {