diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-11-29 10:46:08 -0500 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-12-03 13:00:01 -0500 |
commit | f2592d3ee3c5817981f343b90bfb9c5612f38d23 (patch) | |
tree | 601750911506d8e05b1e2e0c9d9609b6e6c5d5e1 /net/bluetooth | |
parent | cbabee788ff881b87bbaf258caf080b49a61fa43 (diff) |
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/l2cap_core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 8c432771d6f9..2c78208d793e 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -3112,7 +3112,7 @@ done: | |||
3112 | 3112 | ||
3113 | if (chan->conn->feat_mask & L2CAP_FEAT_FCS) | 3113 | if (chan->conn->feat_mask & L2CAP_FEAT_FCS) |
3114 | if (chan->fcs == L2CAP_FCS_NONE || | 3114 | if (chan->fcs == L2CAP_FCS_NONE || |
3115 | test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) { | 3115 | test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) { |
3116 | chan->fcs = L2CAP_FCS_NONE; | 3116 | chan->fcs = L2CAP_FCS_NONE; |
3117 | l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1, | 3117 | l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1, |
3118 | chan->fcs); | 3118 | chan->fcs); |
@@ -3140,7 +3140,7 @@ done: | |||
3140 | 3140 | ||
3141 | if (chan->conn->feat_mask & L2CAP_FEAT_FCS) | 3141 | if (chan->conn->feat_mask & L2CAP_FEAT_FCS) |
3142 | if (chan->fcs == L2CAP_FCS_NONE || | 3142 | if (chan->fcs == L2CAP_FCS_NONE || |
3143 | test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) { | 3143 | test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) { |
3144 | chan->fcs = L2CAP_FCS_NONE; | 3144 | chan->fcs = L2CAP_FCS_NONE; |
3145 | l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1, | 3145 | l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1, |
3146 | chan->fcs); | 3146 | chan->fcs); |
@@ -3196,7 +3196,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data) | |||
3196 | 3196 | ||
3197 | case L2CAP_CONF_FCS: | 3197 | case L2CAP_CONF_FCS: |
3198 | if (val == L2CAP_FCS_NONE) | 3198 | if (val == L2CAP_FCS_NONE) |
3199 | set_bit(CONF_NO_FCS_RECV, &chan->conf_state); | 3199 | set_bit(CONF_RECV_NO_FCS, &chan->conf_state); |
3200 | break; | 3200 | break; |
3201 | 3201 | ||
3202 | case L2CAP_CONF_EFS: | 3202 | case L2CAP_CONF_EFS: |
@@ -3435,7 +3435,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, | |||
3435 | case L2CAP_CONF_FCS: | 3435 | case L2CAP_CONF_FCS: |
3436 | if (*result == L2CAP_CONF_PENDING) | 3436 | if (*result == L2CAP_CONF_PENDING) |
3437 | if (val == L2CAP_FCS_NONE) | 3437 | if (val == L2CAP_FCS_NONE) |
3438 | set_bit(CONF_NO_FCS_RECV, | 3438 | set_bit(CONF_RECV_NO_FCS, |
3439 | &chan->conf_state); | 3439 | &chan->conf_state); |
3440 | break; | 3440 | break; |
3441 | } | 3441 | } |
@@ -3807,7 +3807,7 @@ static inline void set_default_fcs(struct l2cap_chan *chan) | |||
3807 | */ | 3807 | */ |
3808 | if (chan->mode != L2CAP_MODE_ERTM && chan->mode != L2CAP_MODE_STREAMING) | 3808 | if (chan->mode != L2CAP_MODE_ERTM && chan->mode != L2CAP_MODE_STREAMING) |
3809 | chan->fcs = L2CAP_FCS_NONE; | 3809 | chan->fcs = L2CAP_FCS_NONE; |
3810 | else if (!test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) | 3810 | else if (!test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) |
3811 | chan->fcs = L2CAP_FCS_CRC16; | 3811 | chan->fcs = L2CAP_FCS_CRC16; |
3812 | } | 3812 | } |
3813 | 3813 | ||