diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-09-24 22:29:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-24 22:29:57 -0400 |
| commit | 76a081e5b32fde17f6f6d007e1806744cc848712 (patch) | |
| tree | 869a5a0c406fbc71ffb803f57aad147014510f27 /net/dccp/ccids/ccid2.c | |
| parent | 0d6c7ae22d4fadbc83677ea1a6144eea8911e319 (diff) | |
| parent | e41542f5167d6b506607f8dd111fa0a3e468ccb8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/ccids/ccid2.c')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 457dd3db7f41..2efb505aeb35 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
| @@ -808,7 +808,7 @@ static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
| 808 | } | 808 | } |
| 809 | 809 | ||
| 810 | static struct ccid_operations ccid2 = { | 810 | static struct ccid_operations ccid2 = { |
| 811 | .ccid_id = 2, | 811 | .ccid_id = DCCPC_CCID2, |
| 812 | .ccid_name = "ccid2", | 812 | .ccid_name = "ccid2", |
| 813 | .ccid_owner = THIS_MODULE, | 813 | .ccid_owner = THIS_MODULE, |
| 814 | .ccid_hc_tx_obj_size = sizeof(struct ccid2_hc_tx_sock), | 814 | .ccid_hc_tx_obj_size = sizeof(struct ccid2_hc_tx_sock), |