Commit 861d6882 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

[Bluetooth] Remove global conf_mtu variable from L2CAP 



After the change to the L2CAP configuration parameter handling the
global conf_mtu variable is no longer needed and so remove it.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 876d9484

include/net/bluetooth/l2cap.h

+5 −5
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ struct l2cap_pinfo { 
	__u8		conf_len;

	__u8		conf_state;

	__u8		conf_retry;

	__u16		conf_mtu;



	__u8		ident;
@@ -235,6 +234,7 @@ struct l2cap_pinfo { 
#define L2CAP_CONF_REQ_SENT	0x01

#define L2CAP_CONF_INPUT_DONE	0x02

#define L2CAP_CONF_OUTPUT_DONE	0x04



#define L2CAP_CONF_MAX_RETRIES	2



void l2cap_load(void);

net/bluetooth/l2cap.c

+6 −6
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent) 


	/* Default config options */

	pi->conf_len = 0;

	pi->conf_mtu = L2CAP_DEFAULT_MTU;

	pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;

}
@@ -1332,6 +1331,7 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) 
	int len = pi->conf_len;

	int type, hint, olen;

	unsigned long val;

	u16 mtu = L2CAP_DEFAULT_MTU;

	u16 result = L2CAP_CONF_SUCCESS;



	BT_DBG("sk %p", sk);
@@ -1344,7 +1344,7 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) 


		switch (type) {

		case L2CAP_CONF_MTU:

			pi->conf_mtu = val;

			mtu = val;

			break;



		case L2CAP_CONF_FLUSH_TO:
@@ -1368,10 +1368,10 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) 
		/* Configure output options and let the other side know

		 * which ones we don't like. */



		if (pi->conf_mtu < pi->omtu)

		if (mtu < pi->omtu)

			result = L2CAP_CONF_UNACCEPT;

		else {

			pi->omtu = pi->conf_mtu;

			pi->omtu = mtu;

			pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;

		}