diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-06-21 21:14:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-26 00:33:14 -0400 |
commit | a7d13fbf85375698879d16f118af77fbfcc2de44 (patch) | |
tree | 5b8220160aa441847e3f5f10c1a5086229e8dfa2 /net/dccp/options.c | |
parent | 87cad5c385877ce45244886748564672fd6db035 (diff) |
dccp: remove unused function argument
This removes an unused 'sk' argument from several option-inserting functions.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r-- | net/dccp/options.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c index 07395f861d35..4973badb5d55 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
@@ -299,9 +299,8 @@ static inline u8 dccp_ndp_len(const u64 ndp) | |||
299 | return likely(ndp <= USHRT_MAX) ? 2 : (ndp <= UINT_MAX ? 4 : 6); | 299 | return likely(ndp <= USHRT_MAX) ? 2 : (ndp <= UINT_MAX ? 4 : 6); |
300 | } | 300 | } |
301 | 301 | ||
302 | int dccp_insert_option(struct sock *sk, struct sk_buff *skb, | 302 | int dccp_insert_option(struct sk_buff *skb, const unsigned char option, |
303 | const unsigned char option, | 303 | const void *value, const unsigned char len) |
304 | const void *value, const unsigned char len) | ||
305 | { | 304 | { |
306 | unsigned char *to; | 305 | unsigned char *to; |
307 | 306 | ||
@@ -354,8 +353,7 @@ static inline int dccp_elapsed_time_len(const u32 elapsed_time) | |||
354 | return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4; | 353 | return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4; |
355 | } | 354 | } |
356 | 355 | ||
357 | int dccp_insert_option_elapsed_time(struct sock *sk, struct sk_buff *skb, | 356 | int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed_time) |
358 | u32 elapsed_time) | ||
359 | { | 357 | { |
360 | const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time); | 358 | const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time); |
361 | const int len = 2 + elapsed_time_len; | 359 | const int len = 2 + elapsed_time_len; |
@@ -386,13 +384,13 @@ int dccp_insert_option_elapsed_time(struct sock *sk, struct sk_buff *skb, | |||
386 | 384 | ||
387 | EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time); | 385 | EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time); |
388 | 386 | ||
389 | int dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb) | 387 | int dccp_insert_option_timestamp(struct sk_buff *skb) |
390 | { | 388 | { |
391 | __be32 now = htonl(dccp_timestamp()); | 389 | __be32 now = htonl(dccp_timestamp()); |
392 | /* yes this will overflow but that is the point as we want a | 390 | /* yes this will overflow but that is the point as we want a |
393 | * 10 usec 32 bit timer which mean it wraps every 11.9 hours */ | 391 | * 10 usec 32 bit timer which mean it wraps every 11.9 hours */ |
394 | 392 | ||
395 | return dccp_insert_option(sk, skb, DCCPO_TIMESTAMP, &now, sizeof(now)); | 393 | return dccp_insert_option(skb, DCCPO_TIMESTAMP, &now, sizeof(now)); |
396 | } | 394 | } |
397 | 395 | ||
398 | EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp); | 396 | EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp); |
@@ -533,7 +531,7 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb) | |||
533 | * Obtain RTT sample from Request/Response exchange. | 531 | * Obtain RTT sample from Request/Response exchange. |
534 | * This is currently used in CCID 3 initialisation. | 532 | * This is currently used in CCID 3 initialisation. |
535 | */ | 533 | */ |
536 | if (dccp_insert_option_timestamp(sk, skb)) | 534 | if (dccp_insert_option_timestamp(skb)) |
537 | return -1; | 535 | return -1; |
538 | 536 | ||
539 | } else if (dp->dccps_hc_rx_ackvec != NULL && | 537 | } else if (dp->dccps_hc_rx_ackvec != NULL && |