aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/irlap_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/irlap_event.c')
-rw-r--r--net/irda/irlap_event.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index 99faff68c399..7b6433fe1dc2 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -827,7 +827,7 @@ static int irlap_state_conn(struct irlap_cb *self, IRLAP_EVENT event,
827 irlap_disconnect_indication(self, LAP_DISC_INDICATION); 827 irlap_disconnect_indication(self, LAP_DISC_INDICATION);
828 break; 828 break;
829 default: 829 default:
830 IRDA_DEBUG(1, "%s(), Unknown event %d, %s\n", __FUNCTION__, 830 IRDA_DEBUG(1, "%s(), Unknown event %d, %s\n", __FUNCTION__,
831 event, irlap_event[event]); 831 event, irlap_event[event]);
832 832
833 ret = -1; 833 ret = -1;
@@ -864,7 +864,7 @@ static int irlap_state_setup(struct irlap_cb *self, IRLAP_EVENT event,
864 * between 15 msecs and 45 msecs. 864 * between 15 msecs and 45 msecs.
865 */ 865 */
866 irlap_start_backoff_timer(self, msecs_to_jiffies(20 + 866 irlap_start_backoff_timer(self, msecs_to_jiffies(20 +
867 (jiffies % 30))); 867 (jiffies % 30)));
868 } else { 868 } else {
869 /* Always switch state before calling upper layers */ 869 /* Always switch state before calling upper layers */
870 irlap_next_state(self, LAP_NDM); 870 irlap_next_state(self, LAP_NDM);
@@ -1377,7 +1377,7 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event,
1377 /* Resend rejected frames */ 1377 /* Resend rejected frames */
1378 irlap_resend_rejected_frames(self, CMD_FRAME); 1378 irlap_resend_rejected_frames(self, CMD_FRAME);
1379 1379
1380 /* Give peer some time to retransmit! 1380 /* Give peer some time to retransmit!
1381 * But account for our own Tx. */ 1381 * But account for our own Tx. */
1382 irlap_start_final_timer(self, 2 * self->final_timeout); 1382 irlap_start_final_timer(self, 2 * self->final_timeout);
1383 1383