aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:23:21 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:23:21 -0400
commitce8c2293be47999584908069e78bf6d94beadc53 (patch)
treedfd6909e6866998d2103341b1e1af8c129d0cea8 /net/dccp
parent41e9d344bf52c57ec16648d08618b61d3f1d4bdc (diff)
parentee6a99b539a50b4e9398938a0a6d37f8bf911550 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits) [TG3]: Fix msi issue with kexec/kdump. [NET] XFRM: Fix whitespace errors. [NET] TIPC: Fix whitespace errors. [NET] SUNRPC: Fix whitespace errors. [NET] SCTP: Fix whitespace errors. [NET] RXRPC: Fix whitespace errors. [NET] ROSE: Fix whitespace errors. [NET] RFKILL: Fix whitespace errors. [NET] PACKET: Fix whitespace errors. [NET] NETROM: Fix whitespace errors. [NET] NETFILTER: Fix whitespace errors. [NET] IPV4: Fix whitespace errors. [NET] DCCP: Fix whitespace errors. [NET] CORE: Fix whitespace errors. [NET] BLUETOOTH: Fix whitespace errors. [NET] AX25: Fix whitespace errors. [PATCH] mac80211: remove rtnl locking in ieee80211_sta.c [PATCH] mac80211: fix GCC warning on 64bit platforms [GENETLINK]: Dynamic multicast groups. [NETLIKN]: Allow removing multicast groups. ...
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/lib/loss_interval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 515225f3a464..dd0fc992b042 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -227,7 +227,7 @@ void dccp_li_update_li(struct sock *sk,
227 struct list_head *li_hist_list, 227 struct list_head *li_hist_list,
228 struct list_head *hist_list, 228 struct list_head *hist_list,
229 struct timeval *last_feedback, u16 s, u32 bytes_recv, 229 struct timeval *last_feedback, u16 s, u32 bytes_recv,
230 u32 previous_x_recv, u64 seq_loss, u8 win_loss) 230 u32 previous_x_recv, u64 seq_loss, u8 win_loss)
231{ 231{
232 struct dccp_li_hist_entry *head; 232 struct dccp_li_hist_entry *head;
233 u64 seq_temp; 233 u64 seq_temp;