diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-25 14:23:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-25 14:23:22 -0500 |
commit | 004971353a403d75e7d50f8b3b304272ef056248 (patch) | |
tree | 705e64d75cbe2b717783029492d28ad4f23ab1d9 | |
parent | 8f44fcc72a454c5eb7cbc138bd53f0963f23e87f (diff) |
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>
-rw-r--r-- | net/phonet/pep.c | 2 |
1 files changed, 2 insertions, 0 deletions
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: | |||
849 | return err; | 849 | return err; |
850 | } | 850 | } |
851 | 851 | ||
852 | #ifndef CONFIG_PHONET_PIPECTRLR | ||
852 | static int pipe_do_remove(struct sock *sk) | 853 | static int pipe_do_remove(struct sock *sk) |
853 | { | 854 | { |
854 | struct pep_sock *pn = pep_sk(sk); | 855 | struct pep_sock *pn = pep_sk(sk); |
@@ -870,6 +871,7 @@ static int pipe_do_remove(struct sock *sk) | |||
870 | 871 | ||
871 | return pn_skb_send(sk, skb, NULL); | 872 | return pn_skb_send(sk, skb, NULL); |
872 | } | 873 | } |
874 | #endif | ||
873 | 875 | ||
874 | /* associated socket ceases to exist */ | 876 | /* associated socket ceases to exist */ |
875 | static void pep_sock_close(struct sock *sk, long timeout) | 877 | static void pep_sock_close(struct sock *sk, long timeout) |