From 30b39d84b781b26a23bfd3b0d37ee026e2c94873 Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Mon, 14 Apr 2008 21:06:09 +0000
Subject: [PATCH] Fix typoes (sigh, using both "p" and "handle" for the pcap_t
 pointer in different modules can lead to confusion).

---
 pcap-bt-linux.c  | 6 +++---
 pcap-usb-linux.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index d8227b4..2ccbd4c 100644
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -33,7 +33,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.13 2008-04-14 20:40:58 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.14 2008-04-14 21:07:50 guy Exp $ (LBL)";
 #endif
  
 #ifdef HAVE_CONFIG_H
@@ -231,7 +231,7 @@ bt_activate(pcap_t* handle)
 		goto close_fail;
 	}
 
-	if (p->opt.rfmon) {
+	if (handle->opt.rfmon) {
 		/*
 		 * Monitor mode doesn't apply to Bluetooth devices.
 		 */
@@ -256,7 +256,7 @@ bt_activate(pcap_t* handle)
 	return 0;
 
 close_fail:
-	pcap_cleanup_live_common(p);
+	pcap_cleanup_live_common(handle);
 	return err;
 }
 
diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index 98bc16c..f6dc705 100644
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -34,7 +34,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.23 2008-04-14 20:40:58 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.24 2008-04-14 21:06:09 guy Exp $ (LBL)";
 #endif
  
 #ifdef HAVE_CONFIG_H
@@ -226,7 +226,7 @@ usb_activate(pcap_t* handle)
 	handle->fd = open(full_path, O_RDONLY, 0);
 	if (handle->fd >= 0)
 	{
-		if (p->opt.rfmon) {
+		if (handle->opt.rfmon) {
 			/*
 			 * Monitor mode doesn't apply to USB devices.
 			 */
@@ -266,7 +266,7 @@ usb_activate(pcap_t* handle)
 		handle->read_op = usb_read_linux;
 	}
 
-	if (p->opt.rfmon) {
+	if (handle->opt.rfmon) {
 		/*
 		 * Monitor mode doesn't apply to USB devices.
 		 */