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 /net/dccp/minisocks.c | |
| parent | dccp: Clean up old feature-negotiation infrastructure (diff) | |
| download | linux-dev-0049bab5e765aa74cf767a834fa336e19453fc5e.tar.xz linux-dev-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 'net/dccp/minisocks.c')
| -rw-r--r-- | net/dccp/minisocks.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 308b6b928c3d..210c346899ba 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c @@ -45,8 +45,6 @@ EXPORT_SYMBOL_GPL(dccp_death_row); void dccp_minisock_init(struct dccp_minisock *dmsk) { dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window; - dmsk->dccpms_rx_ccid = sysctl_dccp_feat_rx_ccid; - dmsk->dccpms_tx_ccid = sysctl_dccp_feat_tx_ccid; dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector; dmsk->dccpms_send_ndp_count = sysctl_dccp_feat_send_ndp_count; } |