openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: Fix typo negociating -> negotiating 

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Waldemar Rymarkiewicz 2012-09-24 08:07:07 +02:00 committed by Samuel Ortiz
parent 12bfd1e890
commit 4c0ba9ac4b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/nfc/hci/llc_shdlc.c
View File

@ -31,7 +31,7 @@
enum shdlc_state { enum shdlc_state {
SHDLC_DISCONNECTED = 0, SHDLC_DISCONNECTED = 0,
SHDLC_CONNECTING = 1, SHDLC_CONNECTING = 1,
SHDLC_NEGOCIATING = 2, SHDLC_NEGOTIATING = 2,
SHDLC_HALF_CONNECTED = 3, SHDLC_HALF_CONNECTED = 3,
SHDLC_CONNECTED = 4 SHDLC_CONNECTED = 4
}; };
@ -416,7 +416,7 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
switch (u_frame_modifier) { switch (u_frame_modifier) {
case U_FRAME_RSET: case U_FRAME_RSET:
switch (shdlc->state) { switch (shdlc->state) {
case SHDLC_NEGOCIATING: case SHDLC_NEGOTIATING:
case SHDLC_CONNECTING: case SHDLC_CONNECTING:
/* /*
* We sent RSET, but chip wants to negociate or we * We sent RSET, but chip wants to negociate or we
@ -457,7 +457,7 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
case U_FRAME_UA: case U_FRAME_UA:
if ((shdlc->state == SHDLC_CONNECTING && if ((shdlc->state == SHDLC_CONNECTING &&
shdlc->connect_tries > 0) || shdlc->connect_tries > 0) ||
(shdlc->state == SHDLC_NEGOCIATING)) { (shdlc->state == SHDLC_NEGOTIATING)) {
llc_shdlc_connect_complete(shdlc, 0); llc_shdlc_connect_complete(shdlc, 0);
shdlc->state = SHDLC_CONNECTED; shdlc->state = SHDLC_CONNECTED;
} }
@ -640,10 +640,10 @@ static void llc_shdlc_sm_work(struct work_struct *work)
mod_timer(&shdlc->connect_timer, jiffies + mod_timer(&shdlc->connect_timer, jiffies +
msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS)); msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS));
shdlc->state = SHDLC_NEGOCIATING; shdlc->state = SHDLC_NEGOTIATING;
} }
break; break;
case SHDLC_NEGOCIATING: case SHDLC_NEGOTIATING:
if (timer_pending(&shdlc->connect_timer) == 0) { if (timer_pending(&shdlc->connect_timer) == 0) {
shdlc->state = SHDLC_CONNECTING; shdlc->state = SHDLC_CONNECTING;
queue_work(system_nrt_wq, &shdlc->sm_work); queue_work(system_nrt_wq, &shdlc->sm_work);