git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
irda
/
irlap.c
diff --git
a/net/irda/irlap.c
b/net/irda/irlap.c
index
046ad07
..
a165286
100644
(file)
--- a/
net/irda/irlap.c
+++ b/
net/irda/irlap.c
@@
-445,9
+445,8
@@
void irlap_disconnect_request(struct irlap_cb *self)
IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
/* Don't disconnect until all data frames are successfully sent */
IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
/* Don't disconnect until all data frames are successfully sent */
- if (
skb_queue_len(&self->txq) > 0
) {
+ if (
!skb_queue_empty(&self->txq)
) {
self->disconnect_pending = TRUE;
self->disconnect_pending = TRUE;
-
return;
}
return;
}
@@
-885,7
+884,8
@@
static void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now)
if (now) {
/* Send down empty frame to trigger speed change */
skb = dev_alloc_skb(0);
if (now) {
/* Send down empty frame to trigger speed change */
skb = dev_alloc_skb(0);
- irlap_queue_xmit(self, skb);
+ if (skb)
+ irlap_queue_xmit(self, skb);
}
}
}
}