lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/ppp_generic.c
This commit is contained in:
David S. Miller
2008-12-23 17:56:23 -08:00
parent 908a7a16b8 739840d529
commit 6332178d91
8 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/bluetooth/rfcomm/core.c
View File

@ -1781,8 +1781,6 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s)
if (err < 0)
return;
__module_get(nsock->ops->owner);
/* Set our callbacks */
nsock->sk->sk_data_ready = rfcomm_l2data_ready;
nsock->sk->sk_state_change = rfcomm_l2state_change;