diff --git a/[refs] b/[refs]
index a63ebefcc56c..26405bd42905 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 543d9cfeec4d58ad3fd974db5531b06b6b95deb4
+refs/heads/master: e6f507196c2b50243beb09b1bfa4639f999d4d1e
diff --git a/trunk/security/selinux/include/xfrm.h b/trunk/security/selinux/include/xfrm.h
index a7f388bff3f2..c10f1fc41502 100644
--- a/trunk/security/selinux/include/xfrm.h
+++ b/trunk/security/selinux/include/xfrm.h
@@ -51,6 +51,16 @@ static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
 {
 	return NF_ACCEPT;
 }
+
+static inline int selinux_socket_getpeer_stream(struct sock *sk)
+{
+	return SECSID_NULL;
+}
+
+static inline int selinux_socket_getpeer_dgram(struct sk_buff *skb)
+{
+	return SECSID_NULL;
+}
 #endif
 
 #endif /* _SELINUX_XFRM_H_ */