phonet: Protect pipe_do_remove() with appropriate ifdefs.
authorDavid S. Miller <davem@davemloft.net>
Fri, 25 Feb 2011 19:23:22 +0000 (11:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 25 Feb 2011 19:23:22 +0000 (11:23 -0800)
It is only used when CONFIG_PHONET_PIPECTRLR is not set.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/phonet/pep.c

index b8c31fc928e1f417a1529c8e4dc30d80b4440dee..875e86cadcfdcd27264f0ef67ff5e69d5d577091 100644 (file)
@@ -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)