Re: linux-next: manual merge of the bluetooth tree with Linus' tree

[Gustavo F. Padovan]

Hi Stephen,

* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> [2011-04-28 11:34:04 +1000]:

> Hi Gustavo,
> 
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/l2cap_sock.c between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit dbe1c0aea650 ("Bluetooth: Move
> conn to struct l2cap_chan") from the bluetooth tree.
> 
> Just context changes.  I fxied it up (see below) and can carry the fix as
> necessary.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc net/bluetooth/l2cap_sock.c
> index 47394a1,09cc7a0..0000000
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@@ -678,8 -692,8 +692,8 @@@ static int l2cap_sock_setsockopt(struc
>   		}
>   
>   		if (opt == BT_FLUSHABLE_OFF) {
> - 			struct l2cap_conn *conn = l2cap_pi(sk)->conn;
> + 			struct l2cap_conn *conn = chan->conn;
>  -			/* proceed futher only when we have l2cap_conn and
>  +			/* proceed further only when we have l2cap_conn and
>   			   No Flush support in the LM */
>   			if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) {
>   				err = -EINVAL;

Thanks for the fix. 

-- 
Gustavo F. Padovan
http://profusion.mobi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/