[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: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
876d9484ed
commit
861d6882b3
|
@ -221,7 +221,6 @@ struct l2cap_pinfo {
|
||||||
__u8 conf_len;
|
__u8 conf_len;
|
||||||
__u8 conf_state;
|
__u8 conf_state;
|
||||||
__u8 conf_retry;
|
__u8 conf_retry;
|
||||||
__u16 conf_mtu;
|
|
||||||
|
|
||||||
__u8 ident;
|
__u8 ident;
|
||||||
|
|
||||||
|
@ -232,10 +231,11 @@ struct l2cap_pinfo {
|
||||||
struct sock *prev_c;
|
struct sock *prev_c;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define L2CAP_CONF_REQ_SENT 0x01
|
#define L2CAP_CONF_REQ_SENT 0x01
|
||||||
#define L2CAP_CONF_INPUT_DONE 0x02
|
#define L2CAP_CONF_INPUT_DONE 0x02
|
||||||
#define L2CAP_CONF_OUTPUT_DONE 0x04
|
#define L2CAP_CONF_OUTPUT_DONE 0x04
|
||||||
#define L2CAP_CONF_MAX_RETRIES 2
|
|
||||||
|
#define L2CAP_CONF_MAX_RETRIES 2
|
||||||
|
|
||||||
void l2cap_load(void);
|
void l2cap_load(void);
|
||||||
|
|
||||||
|
|
|
@ -508,7 +508,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
|
||||||
|
|
||||||
/* Default config options */
|
/* Default config options */
|
||||||
pi->conf_len = 0;
|
pi->conf_len = 0;
|
||||||
pi->conf_mtu = L2CAP_DEFAULT_MTU;
|
|
||||||
pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
|
pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1256,11 +1255,11 @@ static inline int l2cap_get_conf_opt(void **ptr, int *type, int *olen, unsigned
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
*val = __le16_to_cpu(*((__le16 *)opt->val));
|
*val = __le16_to_cpu(*((__le16 *) opt->val));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
*val = __le32_to_cpu(*((__le32 *)opt->val));
|
*val = __le32_to_cpu(*((__le32 *) opt->val));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -1332,6 +1331,7 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
|
||||||
int len = pi->conf_len;
|
int len = pi->conf_len;
|
||||||
int type, hint, olen;
|
int type, hint, olen;
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
u16 mtu = L2CAP_DEFAULT_MTU;
|
||||||
u16 result = L2CAP_CONF_SUCCESS;
|
u16 result = L2CAP_CONF_SUCCESS;
|
||||||
|
|
||||||
BT_DBG("sk %p", sk);
|
BT_DBG("sk %p", sk);
|
||||||
|
@ -1344,7 +1344,7 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case L2CAP_CONF_MTU:
|
case L2CAP_CONF_MTU:
|
||||||
pi->conf_mtu = val;
|
mtu = val;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case L2CAP_CONF_FLUSH_TO:
|
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
|
/* Configure output options and let the other side know
|
||||||
* which ones we don't like. */
|
* which ones we don't like. */
|
||||||
|
|
||||||
if (pi->conf_mtu < pi->omtu)
|
if (mtu < pi->omtu)
|
||||||
result = L2CAP_CONF_UNACCEPT;
|
result = L2CAP_CONF_UNACCEPT;
|
||||||
else {
|
else {
|
||||||
pi->omtu = pi->conf_mtu;
|
pi->omtu = mtu;
|
||||||
pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;
|
pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue