diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 08:52:55 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 08:52:55 +0900 |
| commit | 1f782fee18b39b9ad438ebbd82c2915a16c879ee (patch) | |
| tree | f292930065e6c860714c134790ab8882680ac739 /include/net/sctp/sm.h | |
| parent | 8eda2f21ed9c936a54fd7bc16cbfa5ee656635c2 (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
| download | op-kernel-dev-1f782fee18b39b9ad438ebbd82c2915a16c879ee.zip op-kernel-dev-1f782fee18b39b9ad438ebbd82c2915a16c879ee.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/sctp/sm.h')
| -rw-r--r-- | include/net/sctp/sm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h index 61d73e3..4088c89 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h @@ -438,7 +438,7 @@ sctp_vtag_verify_either(const struct sctp_chunk *chunk, */ if ((!sctp_test_T_bit(chunk) && (ntohl(chunk->sctp_hdr->vtag) == asoc->c.my_vtag)) || - (sctp_test_T_bit(chunk) && + (sctp_test_T_bit(chunk) && asoc->c.peer_vtag && (ntohl(chunk->sctp_hdr->vtag) == asoc->c.peer_vtag))) { return 1; } |
