Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67be1e4f authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
parents a715c7dd 8a96f3cd

drivers/bluetooth/ath3k.c

+2 −1
Original line number Diff line number Diff line
@@ -193,9 +193,10 @@ static int ath3k_load_firmware(struct usb_device *udev, 
	sent += 20;

	count -= 20;



	pipe = usb_sndbulkpipe(udev, 0x02);



	while (count) {

		size = min_t(uint, count, BULK_SIZE);

		pipe = usb_sndbulkpipe(udev, 0x02);

		memcpy(send_buf, firmware->data + sent, size);



		err = usb_bulk_msg(udev, pipe, send_buf, size,

net/bluetooth/6lowpan.c

+35 −30
Original line number Diff line number Diff line
@@ -420,12 +420,18 @@ static int conn_send(struct l2cap_conn *conn, 
	return 0;

}



static void get_dest_bdaddr(struct in6_addr *ip6_daddr,

			    bdaddr_t *addr, u8 *addr_type)

static u8 get_addr_type_from_eui64(u8 byte)

{

	u8 *eui64;

	/* Is universal(0) or local(1) bit,  */

	if (byte & 0x02)

		return ADDR_LE_DEV_RANDOM;



	return ADDR_LE_DEV_PUBLIC;

}



	eui64 = ip6_daddr->s6_addr + 8;

static void copy_to_bdaddr(struct in6_addr *ip6_daddr, bdaddr_t *addr)

{

	u8 *eui64 = ip6_daddr->s6_addr + 8;



	addr->b[0] = eui64[7];

	addr->b[1] = eui64[6];
@@ -433,16 +439,19 @@ static void get_dest_bdaddr(struct in6_addr *ip6_daddr, 
	addr->b[3] = eui64[2];

	addr->b[4] = eui64[1];

	addr->b[5] = eui64[0];

}



	addr->b[5] ^= 2;

static void convert_dest_bdaddr(struct in6_addr *ip6_daddr,

				bdaddr_t *addr, u8 *addr_type)

{

	copy_to_bdaddr(ip6_daddr, addr);



	/* Set universal/local bit to 0 */

	if (addr->b[5] & 1) {

		addr->b[5] &= ~1;

		*addr_type = ADDR_LE_DEV_PUBLIC;

	} else {

		*addr_type = ADDR_LE_DEV_RANDOM;

	}

	/* We need to toggle the U/L bit that we got from IPv6 address

	 * so that we get the proper address and type of the BD address.

	 */

	addr->b[5] ^= 0x02;



	*addr_type = get_addr_type_from_eui64(addr->b[5]);

}



static int header_create(struct sk_buff *skb, struct net_device *netdev,
@@ -473,9 +482,11 @@ static int header_create(struct sk_buff *skb, struct net_device *netdev, 
		/* Get destination BT device from skb.

		 * If there is no such peer then discard the packet.

		 */

		get_dest_bdaddr(&hdr->daddr, &addr, &addr_type);

		convert_dest_bdaddr(&hdr->daddr, &addr, &addr_type);



		BT_DBG("dest addr %pMR type %d", &addr, addr_type);

		BT_DBG("dest addr %pMR type %s IP %pI6c", &addr,

		       addr_type == ADDR_LE_DEV_PUBLIC ? "PUBLIC" : "RANDOM",

		       &hdr->daddr);



		read_lock_irqsave(&devices_lock, flags);

		peer = peer_lookup_ba(dev, &addr, addr_type);
@@ -556,7 +567,7 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev) 
	} else {

		unsigned long flags;



		get_dest_bdaddr(&lowpan_cb(skb)->addr, &addr, &addr_type);

		convert_dest_bdaddr(&lowpan_cb(skb)->addr, &addr, &addr_type);

		eui64_addr = lowpan_cb(skb)->addr.s6_addr + 8;

		dev = lowpan_dev(netdev);
@@ -564,8 +575,10 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev) 
		peer = peer_lookup_ba(dev, &addr, addr_type);

		read_unlock_irqrestore(&devices_lock, flags);



		BT_DBG("xmit from %s to %pMR (%pI6c) peer %p", netdev->name,

		       &addr, &lowpan_cb(skb)->addr, peer);

		BT_DBG("xmit %s to %pMR type %s IP %pI6c peer %p",

		       netdev->name, &addr,

		       addr_type == ADDR_LE_DEV_PUBLIC ? "PUBLIC" : "RANDOM",

		       &lowpan_cb(skb)->addr, peer);



		if (peer && peer->conn)

			err = send_pkt(peer->conn, netdev->dev_addr,
@@ -620,13 +633,13 @@ static void set_addr(u8 *eui, u8 *addr, u8 addr_type) 
	eui[6] = addr[1];

	eui[7] = addr[0];



	eui[0] ^= 2;



	/* Universal/local bit set, RFC 4291 */

	/* Universal/local bit set, BT 6lowpan draft ch. 3.2.1 */

	if (addr_type == ADDR_LE_DEV_PUBLIC)

		eui[0] |= 1;

		eui[0] &= ~0x02;

	else

		eui[0] &= ~1;

		eui[0] |= 0x02;



	BT_DBG("type %d addr %*phC", addr_type, 8, eui);

}



static void set_dev_addr(struct net_device *netdev, bdaddr_t *addr,
@@ -634,7 +647,6 @@ static void set_dev_addr(struct net_device *netdev, bdaddr_t *addr, 
{

	netdev->addr_assign_type = NET_ADDR_PERM;

	set_addr(netdev->dev_addr, addr->b, addr_type);

	netdev->dev_addr[0] ^= 2;

}



static void ifup(struct net_device *netdev)
@@ -684,13 +696,6 @@ static int add_peer_conn(struct l2cap_conn *conn, struct lowpan_dev *dev) 


	memcpy(&peer->eui64_addr, (u8 *)&peer->peer_addr.s6_addr + 8,

	       EUI64_ADDR_LEN);

	peer->eui64_addr[0] ^= 2; /* second bit-flip (Universe/Local)

				   * is done according RFC2464

				   */



	raw_dump_inline(__func__, "peer IPv6 address",

			(unsigned char *)&peer->peer_addr, 16);

	raw_dump_inline(__func__, "peer EUI64 address", peer->eui64_addr, 8);



	write_lock_irqsave(&devices_lock, flags);

	INIT_LIST_HEAD(&peer->list);

net/bluetooth/hci_event.c

+3 −1
Original line number Diff line number Diff line
@@ -1453,6 +1453,7 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev, 
	 * is requested.

	 */

	if (!hci_conn_ssp_enabled(conn) && !(conn->auth_type & 0x01) &&

	    conn->pending_sec_level != BT_SECURITY_FIPS &&

	    conn->pending_sec_level != BT_SECURITY_HIGH &&

	    conn->pending_sec_level != BT_SECURITY_MEDIUM)

		return 0;
@@ -3076,7 +3077,8 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		}



		if (key->type == HCI_LK_COMBINATION && key->pin_len < 16 &&

		    conn->pending_sec_level == BT_SECURITY_HIGH) {

		    (conn->pending_sec_level == BT_SECURITY_HIGH ||

		     conn->pending_sec_level == BT_SECURITY_FIPS)) {

			BT_DBG("%s ignoring key unauthenticated for high security",

			       hdev->name);

			goto not_found;

net/bluetooth/l2cap_core.c

+6 −0
Original line number Diff line number Diff line
@@ -471,8 +471,14 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan) 
	chan->max_tx = L2CAP_DEFAULT_MAX_TX;

	chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;

	chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW;

	chan->remote_max_tx = chan->max_tx;

	chan->remote_tx_win = chan->tx_win;

	chan->ack_win = L2CAP_DEFAULT_TX_WINDOW;

	chan->sec_level = BT_SECURITY_LOW;

	chan->flush_to = L2CAP_DEFAULT_FLUSH_TO;

	chan->retrans_timeout = L2CAP_DEFAULT_RETRANS_TO;

	chan->monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;

	chan->conf_state = 0;



	set_bit(FLAG_FORCE_ACTIVE, &chan->flags);

}

net/bluetooth/l2cap_sock.c

+4 −1
Original line number Diff line number Diff line
@@ -1180,13 +1180,16 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan) 
	/* Check for backlog size */

	if (sk_acceptq_is_full(parent)) {

		BT_DBG("backlog full %d", parent->sk_ack_backlog);

		release_sock(parent);

		return NULL;

	}



	sk = l2cap_sock_alloc(sock_net(parent), NULL, BTPROTO_L2CAP,

			      GFP_ATOMIC);

	if (!sk)

	if (!sk) {

		release_sock(parent);

		return NULL;

        }



	bt_sock_reclassify_lock(sk, BTPROTO_L2CAP);