diff options
| author | Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no> | 2017-04-25 06:00:31 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2017-04-28 16:06:25 +0300 |
| commit | 40b03f9b53a1c865bdb81a2c4a30eae1fc803aa1 (patch) | |
| tree | 9b89acd749cea1b897934dd5fa4e80db76ebec7b | |
| parent | 61ce59080bf4828d5603c94d8d45f3339fe306fe (diff) | |
Bluetooth: l2cap: Dont use BT namespace in internal MPS/MTU macro
Remove BT_ prefix from BT_L2CAP_MAX_LE_MPS and
BT_L2CAP_MAX_LE_MTU as they are internal to l2cap.c file.
Change-id: I6abec0a1f07b8aef49940ab7abeaacbd19947e0b
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
| -rw-r--r-- | subsys/bluetooth/host/l2cap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c index 8cacac5a8..db284fc47 100644 --- a/subsys/bluetooth/host/l2cap.c +++ b/subsys/bluetooth/host/l2cap.c @@ -44,9 +44,9 @@ /* Size of MTU is based on the maximum amount of data the buffer can hold * excluding ACL and driver headers. */ -#define BT_L2CAP_MAX_LE_MPS BT_L2CAP_RX_MTU +#define L2CAP_MAX_LE_MPS BT_L2CAP_RX_MTU /* For now use MPS - SDU length to disable segmentation */ -#define BT_L2CAP_MAX_LE_MTU (BT_L2CAP_MAX_LE_MPS - 2) +#define L2CAP_MAX_LE_MTU (L2CAP_MAX_LE_MPS - 2) #if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) #define l2cap_lookup_ident(conn, ident) __l2cap_lookup_ident(conn, ident, false) @@ -61,7 +61,7 @@ static sys_slist_t servers; #if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) /* Pool for outgoing LE data packets, MTU is 23 */ NET_BUF_POOL_DEFINE(le_data_pool, CONFIG_BLUETOOTH_MAX_CONN, - BT_L2CAP_BUF_SIZE(BT_L2CAP_MAX_LE_MPS), + BT_L2CAP_BUF_SIZE(L2CAP_MAX_LE_MPS), BT_BUF_USER_DATA_MIN, NULL); #endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ @@ -634,7 +634,7 @@ static void l2cap_chan_rx_init(struct bt_l2cap_le_chan *chan) /* Use existing MTU if defined */ if (!chan->rx.mtu) { - chan->rx.mtu = BT_L2CAP_MAX_LE_MTU; + chan->rx.mtu = L2CAP_MAX_LE_MTU; } /* Use existing credits if defined */ @@ -642,13 +642,13 @@ static void l2cap_chan_rx_init(struct bt_l2cap_le_chan *chan) if (chan->chan.ops->alloc_buf) { /* Auto tune credits to receive a full packet */ chan->rx.init_credits = chan->rx.mtu / - BT_L2CAP_MAX_LE_MPS; + L2CAP_MAX_LE_MPS; } else { chan->rx.init_credits = L2CAP_LE_MAX_CREDITS; } } - chan->rx.mps = BT_L2CAP_MAX_LE_MPS; + chan->rx.mps = L2CAP_MAX_LE_MPS; k_sem_init(&chan->rx.credits, 0, UINT_MAX); } @@ -1008,7 +1008,7 @@ static inline struct net_buf *l2cap_alloc_seg(struct net_buf *buf) /* Try to use original pool if possible */ if (buf->pool->user_data_size >= BT_BUF_USER_DATA_MIN && - buf->pool->buf_size >= BT_L2CAP_BUF_SIZE(BT_L2CAP_MAX_LE_MPS)) { + buf->pool->buf_size >= BT_L2CAP_BUF_SIZE(L2CAP_MAX_LE_MPS)) { seg = net_buf_alloc(buf->pool, K_NO_WAIT); if (seg) { net_buf_reserve(seg, BT_L2CAP_CHAN_SEND_RESERVE); |