Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCS

Make code more readable by changing CONF_NO_FCS_RECV which is read
as "No L2CAP FCS option received" to CONF_RECV_NO_FCS which means
"Received L2CAP option NO_FCS". This flag really means that we have
received L2CAP FRAME CHECK SEQUENCE (FCS) OPTION with value "No FCS".

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index f57fab04e7c5ff8b77c2c06eb92fd8dddcbf0f97..7588ef44ebaf22e7cc76a55a40a77166325791d0 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -611,7 +611,7 @@ enum {
        CONF_MTU_DONE,
        CONF_MODE_DONE,
        CONF_CONNECT_PEND,
-       CONF_NO_FCS_RECV,
+       CONF_RECV_NO_FCS,
        CONF_STATE2_DEVICE,
        CONF_EWS_RECV,
        CONF_LOC_CONF_PEND,

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8c432771d6f9eb3a5a926f997b77e8dc119e9252..2c78208d793eb8db838cf85a480e029a4dc3567b 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3112,7 +3112,7 @@ done:
 
                if (chan->conn->feat_mask & L2CAP_FEAT_FCS)
                        if (chan->fcs == L2CAP_FCS_NONE ||
-                           test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) {
+                           test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) {
                                chan->fcs = L2CAP_FCS_NONE;
                                l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,
                                                   chan->fcs);
@@ -3140,7 +3140,7 @@ done:
 
                if (chan->conn->feat_mask & L2CAP_FEAT_FCS)
                        if (chan->fcs == L2CAP_FCS_NONE ||
-                           test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) {
+                           test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) {
                                chan->fcs = L2CAP_FCS_NONE;
                                l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,
                                                   chan->fcs);
@@ -3196,7 +3196,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data)
 
                case L2CAP_CONF_FCS:
                        if (val == L2CAP_FCS_NONE)
-                               set_bit(CONF_NO_FCS_RECV, &chan->conf_state);
+                               set_bit(CONF_RECV_NO_FCS, &chan->conf_state);
                        break;
 
                case L2CAP_CONF_EFS:
@@ -3435,7 +3435,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
                case L2CAP_CONF_FCS:
                        if (*result == L2CAP_CONF_PENDING)
                                if (val == L2CAP_FCS_NONE)
-                                       set_bit(CONF_NO_FCS_RECV,
+                                       set_bit(CONF_RECV_NO_FCS,
                                                &chan->conf_state);
                        break;
                }
@@ -3807,7 +3807,7 @@ static inline void set_default_fcs(struct l2cap_chan *chan)
         */
        if (chan->mode != L2CAP_MODE_ERTM && chan->mode != L2CAP_MODE_STREAMING)
                chan->fcs = L2CAP_FCS_NONE;
-       else if (!test_bit(CONF_NO_FCS_RECV, &chan->conf_state))
+       else if (!test_bit(CONF_RECV_NO_FCS, &chan->conf_state))
                chan->fcs = L2CAP_FCS_CRC16;
 }