mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
This commit is contained in:
commit
fb3dbece26
3 changed files with 51 additions and 33 deletions
|
|
@ -161,12 +161,30 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk, unsigned long l
|
|||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
release_sock(sk);
|
||||
if ((skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err))) {
|
||||
skb_reserve(skb, BT_SKB_RESERVE);
|
||||
bt_cb(skb)->incoming = 0;
|
||||
}
|
||||
lock_sock(sk);
|
||||
|
||||
if (!skb && *err)
|
||||
return NULL;
|
||||
|
||||
*err = sock_error(sk);
|
||||
if (*err)
|
||||
goto out;
|
||||
|
||||
if (sk->sk_shutdown) {
|
||||
*err = -ECONNRESET;
|
||||
goto out;
|
||||
}
|
||||
|
||||
return skb;
|
||||
|
||||
out:
|
||||
kfree_skb(skb);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int bt_err(__u16 code);
|
||||
|
|
|
|||
Loading…
Reference in a new issue