diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-12-08 01:18:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-08 01:18:05 -0800 |
| commit | 0049bab5e765aa74cf767a834fa336e19453fc5e (patch) | |
| tree | f3210e13c5645dbedffe90a4b1f1dca787673bb0 /include | |
| parent | 63b8e2861f31868dce9c92fd7444f212a5a8a775 (diff) | |
| download | linux-3.10-0049bab5e765aa74cf767a834fa336e19453fc5e.tar.gz linux-3.10-0049bab5e765aa74cf767a834fa336e19453fc5e.tar.bz2 linux-3.10-0049bab5e765aa74cf767a834fa336e19453fc5e.zip | |
dccp: Remove obsolete parts of the old CCID interface
The TX/RX CCIDs of the minisock are now redundant: similar to the Ack Vector
case, their value equals initially that of the sysctl, but at the end of
feature negotiation may be something different.
The old interface removed by this patch thus has been replaced by the newer
interface to dynamically query the currently loaded CCIDs.
Also removed are the constructors for the TX CCID and the RX CCID, since the
switch "rx <-> non-rx" is done by the handler in minisocks.c (and the handler
is the only place in the code where CCIDs are loaded).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dccp.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 6a72ff52a8a..46daea312d9 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h @@ -370,7 +370,6 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) * Will be used to pass the state from dccp_request_sock to dccp_sock. * * @dccpms_sequence_window - Sequence Window Feature (section 7.5.2) - * @dccpms_ccid - Congestion Control Id (CCID) (section 10) * @dccpms_send_ack_vector - Send Ack Vector Feature (section 11.5) * @dccpms_send_ndp_count - Send NDP Count Feature (7.7.2) * @dccpms_pending - List of features being negotiated @@ -378,8 +377,6 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) */ struct dccp_minisock { __u64 dccpms_sequence_window; - __u8 dccpms_rx_ccid; - __u8 dccpms_tx_ccid; __u8 dccpms_send_ack_vector; __u8 dccpms_send_ndp_count; struct list_head dccpms_pending; |