From 004971353a403d75e7d50f8b3b304272ef056248 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 25 Feb 2011 11:23:22 -0800 Subject: [PATCH] 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 --- net/phonet/pep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/phonet/pep.c b/net/phonet/pep.c index b8c31fc928e1..875e86cadcfd 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)