---

yaml --- r: 310778 b: refs/heads/master c: d109e9a h: refs/heads/master v: v3
git-mirror · Jun 7, 2012 · c4a8ac2 · c4a8ac2
1 parent c83136c
commit c4a8ac2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1992b169d31f339dc5ea4e9f312567c8cf322a3
+refs/heads/master: d109e9af61a6d2fdf33dc615ab8b724a8e75a8a4
diff --git a/trunk/net/netfilter/nf_conntrack_h323_main.c b/trunk/net/netfilter/nf_conntrack_h323_main.c
@@ -270,9 +270,8 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
 		return 0;
 
 	/* RTP port is even */
-	port &= htons(~1);
-	rtp_port = port;
-	rtcp_port = htons(ntohs(port) + 1);
+	rtp_port = port & ~htons(1);
+	rtcp_port = port | htons(1);
 
 	/* Create expect for RTP */
 	if ((rtp_exp = nf_ct_expect_alloc(ct)) == NULL)