diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-12 14:43:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-12 14:43:42 -0400 |
| commit | 8fa6e3d4549271a5b4094893f059bb95f99a8fde (patch) | |
| tree | 4c8ae1be73e4749f782cc3f18ec6e42650b8f872 /net/dccp/ccids/ccid2.c | |
| parent | c239f279e571a272c1b32a1e84b8fa037b68f49c (diff) | |
| parent | 2f34b32977ade4249601f35f7eb0cdd56b4e0f89 (diff) | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-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 dc18172b1e59..d850e291f87c 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
| @@ -151,7 +151,7 @@ out: | |||
| 151 | sock_put(sk); | 151 | sock_put(sk); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) | 154 | static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len) |
| 155 | { | 155 | { |
| 156 | struct dccp_sock *dp = dccp_sk(sk); | 156 | struct dccp_sock *dp = dccp_sk(sk); |
| 157 | struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk); | 157 | struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk); |