diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 16:15:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 16:47:38 -0500 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/dccp | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index 7d230d14ce22..15af247ea007 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
| @@ -241,7 +241,8 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb) | |||
| 241 | dccp_update_gsr(sk, seqno); | 241 | dccp_update_gsr(sk, seqno); |
| 242 | 242 | ||
| 243 | if (dh->dccph_type != DCCP_PKT_SYNC && | 243 | if (dh->dccph_type != DCCP_PKT_SYNC && |
| 244 | (ackno != DCCP_PKT_WITHOUT_ACK_SEQ)) | 244 | ackno != DCCP_PKT_WITHOUT_ACK_SEQ && |
| 245 | after48(ackno, dp->dccps_gar)) | ||
| 245 | dp->dccps_gar = ackno; | 246 | dp->dccps_gar = ackno; |
| 246 | } else { | 247 | } else { |
| 247 | unsigned long now = jiffies; | 248 | unsigned long now = jiffies; |