chromeos/compat-wireless/net/bluetooth/af_bluetooth.c - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/net/bluetooth/af_bluetooth.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/compat-wireless/net/bluetooth/af_bluetooth.c

diff --git a/chromeos/compat-wireless/net/bluetooth/af_bluetooth.c b/chromeos/compat-wireless/net/bluetooth/af_bluetooth.c

index 50d6ae1d8008a796521dde26f84b3e0cd5897b9f..2fe23de24f78691fab00f0e7a0bbdc9a5e2c5e79 100644

--- a/chromeos/compat-wireless/net/bluetooth/af_bluetooth.c

+++ b/chromeos/compat-wireless/net/bluetooth/af_bluetooth.c

@@ -268,7 +268,7 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,

#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))

sock_recv_ts_and_drops(msg, sk, skb);

#else

- sock_recv_timestamp(msg, sk, skb);

+ sock_recv_timestamp(msg, sk, skb);

#endif

skb_free_datagram(sk, skb);

@@ -352,7 +352,7 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))

amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);

#else

- amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);

+ amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);

#endif

if (amount < 0)

amount = 0;