Commit a015f6f4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

Phonet: kill the ST-Ericsson pipe controller Kconfig 



This is now a run-time choice so that a single kernel can support both
old and new generation ISI modems. Support for manually enabling the
pipe flow is removed as it did not work properly, does not fit well
with the socket API, and I am not aware of any use at the moment.

Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 297edb60

Documentation/networking/phonet.txt

+0 −13
Original line number Diff line number Diff line
@@ -205,19 +205,6 @@ The pipe protocol provides two socket options at the SOL_PNPIPE level: 
    socket descriptors that are already connected or being connected.





Phonet Pipe-controller Implementation

-------------------------------------



Phonet Pipe-controller is enabled by selecting the CONFIG_PHONET_PIPECTRLR

Kconfig option.



The implementation adds socket options at SOL_PNPIPE level:



  PNPIPE_ENABLE accepts one integer value (int). If set to zero, the pipe

    is disabled. If the value is non-zero, the pipe is enabled. If the pipe

    is not (yet) connected, ENOTCONN is error is returned.





Authors

-------

include/linux/phonet.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
#define PNPIPE_ENCAP		1

#define PNPIPE_IFINDEX		2

#define PNPIPE_HANDLE		3

#define PNPIPE_ENABLE           4

/* unused slot */



#define PNADDR_ANY		0

#define PNADDR_BROADCAST	0xFC

net/phonet/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -14,15 +14,3 @@ config PHONET 


	  To compile this driver as a module, choose M here: the module

	  will be called phonet. If unsure, say N.
 


config PHONET_PIPECTRLR

	bool "Phonet Pipe Controller (EXPERIMENTAL)"

	depends on PHONET && EXPERIMENTAL

	default N

	help

	  The Pipe Controller implementation in Phonet stack to support Pipe

	  data with Nokia Slim modems like WG2.5 used on ST-Ericsson U8500

	  platform.



	  This option is incompatible with older Nokia modems.

	  Say N here unless you really know what you are doing.

net/phonet/pep.c

+0 −25
Original line number Diff line number Diff line
@@ -167,15 +167,6 @@ static int pipe_handler_send_created_ind(struct sock *sk) 
				data, 4, GFP_ATOMIC);

}



#ifdef CONFIG_PHONET_PIPECTRLR

static int pipe_handler_enable_pipe(struct sock *sk, int enable)

{

	u8 id = enable ? PNS_PEP_ENABLE_REQ : PNS_PEP_DISABLE_REQ;



	return pipe_handler_request(sk, id, PAD, NULL, 0);

}

#endif



static int pep_accept_conn(struct sock *sk, struct sk_buff *skb)

{

	static const u8 data[20] = {
@@ -968,16 +959,6 @@ static int pep_setsockopt(struct sock *sk, int level, int optname, 
		}

		goto out_norel;



#ifdef CONFIG_PHONET_PIPECTRLR

	case PNPIPE_ENABLE:

		if ((1 << sk->sk_state) & ~(TCPF_SYN_RECV|TCPF_ESTABLISHED)) {

			err = -ENOTCONN;

			break;

		}

		err = pipe_handler_enable_pipe(sk, val);

		break;

#endif



	default:

		err = -ENOPROTOOPT;

	}
@@ -1013,12 +994,6 @@ static int pep_getsockopt(struct sock *sk, int level, int optname, 
			return -EINVAL;

		break;



#ifdef CONFIG_PHONET_PIPECTRLR

	case PNPIPE_ENABLE:

		val = sk->sk_state == TCP_ESTABLISHED;

		break;

#endif



	default:

		return -ENOPROTOOPT;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE