diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-25 11:23:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-25 11:23:22 -0800 |
| commit | 004971353a403d75e7d50f8b3b304272ef056248 (patch) | |
| tree | 705e64d75cbe2b717783029492d28ad4f23ab1d9 | |
| parent | 8f44fcc72a454c5eb7cbc138bd53f0963f23e87f (diff) | |
| download | kernel_samsung_aries-004971353a403d75e7d50f8b3b304272ef056248.zip kernel_samsung_aries-004971353a403d75e7d50f8b3b304272ef056248.tar.gz kernel_samsung_aries-004971353a403d75e7d50f8b3b304272ef056248.tar.bz2 | |
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 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) |