diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:54:33 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:54:33 -0500 |
| commit | 312fef7d18adda2be822d31916547f84ed6af28b (patch) | |
| tree | 095d936b751b0a92946fcf710fb74dea7f8f33f7 /net/bluetooth/rfcomm/sock.c | |
| parent | 5e819059a20b0fc5a71875f28b4cae359e38d85a (diff) | |
| parent | 2aeabcbedd51aef94b61d05b57246d1db4984453 (diff) | |
| download | linux-312fef7d18adda2be822d31916547f84ed6af28b.tar.gz linux-312fef7d18adda2be822d31916547f84ed6af28b.tar.bz2 linux-312fef7d18adda2be822d31916547f84ed6af28b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 5417f6127323..aea2bdd1510f 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -600,6 +600,8 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock, break; } + skb->priority = sk->sk_priority; + err = rfcomm_dlc_send(d, skb); if (err < 0) { kfree_skb(skb); |