diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-14 06:06:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-14 06:06:36 -0400 |
| commit | a18f22a968de17b29f2310cdb7ba69163e65ec15 (patch) | |
| tree | a7d56d88fad5e444d7661484109758a2f436129e /net/irda/irlap_event.c | |
| parent | a1c57e0fec53defe745e64417eacdbd3618c3e66 (diff) | |
| parent | 798778b8653f64b7b2162ac70eca10367cff6ce8 (diff) | |
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.c
Reason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/irda/irlap_event.c')
| -rw-r--r-- | net/irda/irlap_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c index d434c8880745..bb47021c9a55 100644 --- a/net/irda/irlap_event.c +++ b/net/irda/irlap_event.c | |||
| @@ -708,7 +708,7 @@ static int irlap_state_reply(struct irlap_cb *self, IRLAP_EVENT event, | |||
| 708 | 708 | ||
| 709 | self->frame_sent = TRUE; | 709 | self->frame_sent = TRUE; |
| 710 | } | 710 | } |
| 711 | /* Readjust our timer to accomodate devices | 711 | /* Readjust our timer to accommodate devices |
| 712 | * doing faster or slower discovery than us... | 712 | * doing faster or slower discovery than us... |
| 713 | * Jean II */ | 713 | * Jean II */ |
| 714 | irlap_start_query_timer(self, info->S, info->s); | 714 | irlap_start_query_timer(self, info->S, info->s); |
| @@ -931,7 +931,7 @@ static int irlap_state_setup(struct irlap_cb *self, IRLAP_EVENT event, | |||
| 931 | irlap_send_rr_frame(self, CMD_FRAME); | 931 | irlap_send_rr_frame(self, CMD_FRAME); |
| 932 | 932 | ||
| 933 | /* The timer is set to half the normal timer to quickly | 933 | /* The timer is set to half the normal timer to quickly |
| 934 | * detect a failure to negociate the new connection | 934 | * detect a failure to negotiate the new connection |
| 935 | * parameters. IrLAP 6.11.3.2, note 3. | 935 | * parameters. IrLAP 6.11.3.2, note 3. |
| 936 | * Note that currently we don't process this failure | 936 | * Note that currently we don't process this failure |
| 937 | * properly, as we should do a quick disconnect. | 937 | * properly, as we should do a quick disconnect. |
| @@ -1052,7 +1052,7 @@ static int irlap_state_xmit_p(struct irlap_cb *self, IRLAP_EVENT event, | |||
| 1052 | return -EPROTO; | 1052 | return -EPROTO; |
| 1053 | } | 1053 | } |
| 1054 | 1054 | ||
| 1055 | /* Substract space used by this skb */ | 1055 | /* Subtract space used by this skb */ |
| 1056 | self->bytes_left -= skb->len; | 1056 | self->bytes_left -= skb->len; |
| 1057 | #else /* CONFIG_IRDA_DYNAMIC_WINDOW */ | 1057 | #else /* CONFIG_IRDA_DYNAMIC_WINDOW */ |
| 1058 | /* Window has been adjusted for the max packet | 1058 | /* Window has been adjusted for the max packet |
| @@ -1808,7 +1808,7 @@ static int irlap_state_xmit_s(struct irlap_cb *self, IRLAP_EVENT event, | |||
| 1808 | 1808 | ||
| 1809 | return -EPROTO; /* Try again later */ | 1809 | return -EPROTO; /* Try again later */ |
| 1810 | } | 1810 | } |
| 1811 | /* Substract space used by this skb */ | 1811 | /* Subtract space used by this skb */ |
| 1812 | self->bytes_left -= skb->len; | 1812 | self->bytes_left -= skb->len; |
| 1813 | #else /* CONFIG_IRDA_DYNAMIC_WINDOW */ | 1813 | #else /* CONFIG_IRDA_DYNAMIC_WINDOW */ |
| 1814 | /* Window has been adjusted for the max packet | 1814 | /* Window has been adjusted for the max packet |