projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Fix deadlock in the L2CAP layer
[powerpc.git]
/
net
/
irda
/
irlap_frame.c
diff --git
a/net/irda/irlap_frame.c
b/net/irda/irlap_frame.c
index
6dafbb4
..
3e9a06a
100644
(file)
--- a/
net/irda/irlap_frame.c
+++ b/
net/irda/irlap_frame.c
@@
-988,9
+988,6
@@
void irlap_resend_rejected_frames(struct irlap_cb *self, int command)
IRDA_DEBUG(0, "%s(), unable to copy\n", __FUNCTION__);
return;
}
IRDA_DEBUG(0, "%s(), unable to copy\n", __FUNCTION__);
return;
}
- /* Unlink tx_skb from list */
- tx_skb->next = tx_skb->prev = NULL;
- tx_skb->list = NULL;
/* Clear old Nr field + poll bit */
tx_skb->data[1] &= 0x0f;
/* Clear old Nr field + poll bit */
tx_skb->data[1] &= 0x0f;
@@
-1063,9
+1060,6
@@
void irlap_resend_rejected_frame(struct irlap_cb *self, int command)
IRDA_DEBUG(0, "%s(), unable to copy\n", __FUNCTION__);
return;
}
IRDA_DEBUG(0, "%s(), unable to copy\n", __FUNCTION__);
return;
}
- /* Unlink tx_skb from list */
- tx_skb->next = tx_skb->prev = NULL;
- tx_skb->list = NULL;
/* Clear old Nr field + poll bit */
tx_skb->data[1] &= 0x0f;
/* Clear old Nr field + poll bit */
tx_skb->data[1] &= 0x0f;
@@
-1309,7
+1303,7
@@
static void irlap_recv_test_frame(struct irlap_cb *self, struct sk_buff *skb,
* Jean II
*/
int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
* Jean II
*/
int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *ptype)
+ struct packet_type *ptype
, struct net_device *orig_dev
)
{
struct irlap_info info;
struct irlap_cb *self;
{
struct irlap_info info;
struct irlap_cb *self;