Permalink
Browse files

Merge remote-tracking branch 'github/master'

Conflicts:
	pcap-bt-linux.c
  • Loading branch information...
2 parents b6aa2bd + a32bca4 commit 759c16662ebe492c755645cd4a70dfbc31b8e646 @mcr committed Mar 25, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 pcap-bt-linux.c
View
@@ -78,7 +78,7 @@ bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
struct hci_dev_req *dev_req;
int i, sock;
int ret = 0;
-
+
sock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
if (sock < 0)
{

0 comments on commit 759c166

Please sign in to comment.