From: David S. Miller <davem@davemloft.net>
Date: Fri, 25 Feb 2011 19:23:22 +0000 (-0800)
Subject: phonet: Protect pipe_do_remove() with appropriate ifdefs.
X-Git-Tag: v2.6.39-rc1~468^2~229
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=004971353a403d75e7d50f8b3b304272ef056248;p=platform%2Fkernel%2Flinux-stable.git

phonet: Protect pipe_do_remove() with appropriate ifdefs.

It is only used when CONFIG_PHONET_PIPECTRLR is not set.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index b8c31fc..875e86c 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -849,6 +849,7 @@ drop:
 	return err;
 }
 
+#ifndef CONFIG_PHONET_PIPECTRLR
 static int pipe_do_remove(struct sock *sk)
 {
 	struct pep_sock *pn = pep_sk(sk);
@@ -870,6 +871,7 @@ static int pipe_do_remove(struct sock *sk)
 
 	return pn_skb_send(sk, skb, NULL);
 }
+#endif
 
 /* associated socket ceases to exist */
 static void pep_sock_close(struct sock *sk, long timeout)