From 381c4072a7e85b05cdc1a34c68c21d27ff707795 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Sun, 25 Jun 2006 23:41:47 -0700
Subject: [PATCH] --- yaml --- r: 30398 b: refs/heads/master c:
 70cb23477019b8739d23ead223539c7e6dfc509c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/socket.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4880a4b0079..c7e7ffb8e802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac90216abc7d39e694533aec2805efeb06bf8ac
+refs/heads/master: 70cb23477019b8739d23ead223539c7e6dfc509c
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index 648a734e6044..eaf4d6951a4a 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -426,7 +426,7 @@ static int dest_name_check(struct sockaddr_tipc *dest, struct msghdr *m)
 
         if (copy_from_user(&hdr, m->msg_iov[0].iov_base, sizeof(hdr)))
 		return -EFAULT;
-	if ((ntohs(hdr.tcm_type) & 0xC000) & (!capable(CAP_NET_ADMIN)))
+	if ((ntohs(hdr.tcm_type) & 0xC000) && (!capable(CAP_NET_ADMIN)))
 		return -EACCES;
         
 	return 0;