  
 -#endif  /* linux */
 +#endif  /* defined(linux) || defined(USE_LINUX_PACKET_SOCKET) */
-diff -x '.*sw?' -Naur packetdrill.orig/gtests/net/packetdrill/packet_socket_pcap.c packetdrill/gtests/net/packetdrill/packet_socket_pcap.c
---- packetdrill.orig/gtests/net/packetdrill/packet_socket_pcap.c	2014-07-29 13:09:54.428487613 +0400
-+++ packetdrill/gtests/net/packetdrill/packet_socket_pcap.c	2014-07-29 13:04:10.718497491 +0400
+diff -Naur packetdrill.orig/gtests/net/packetdrill/packet_socket_pcap.c packetdrill/gtests/net/packetdrill/packet_socket_pcap.c
+--- packetdrill.orig/gtests/net/packetdrill/packet_socket_pcap.c	2014-08-18 12:39:13.610794246 +0400
++++ packetdrill/gtests/net/packetdrill/packet_socket_pcap.c	2014-08-18 12:38:05.174129210 +0400
 @@ -37,10 +37,14 @@
  
  #if defined(__FreeBSD__)

          gre_packet.o icmp_packet.o ip_packet.o tcp_packet.o udp_packet.o \
          mpls_packet.o \
          run.o run_command.o run_packet.o run_system_call.o \
diff -x '.*sw?' -Naur packetdrill.orig/gtests/net/packetdrill/netdev.c packetdrill/gtests/net/packetdrill/netdev.c
--- packetdrill.orig/gtests/net/packetdrill/netdev.c	2014-07-29 13:09:54.431820906 +0400
+++ packetdrill/gtests/net/packetdrill/netdev.c	2014-07-29 13:09:37.241821198 +0400
@@ -141,6 +141,10 @@
 	netdev->name = strdup(TUN_DEV);
 #endif /* defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) */

 	while ((c = getopt_long(argc, argv, "v", options, NULL)) > 0)
 		process_option(c, optarg, config, "Command Line");
 	return argv + optind;
diff -Naur packetdrill.orig/gtests/net/packetdrill/ip_address.c packetdrill/gtests/net/packetdrill/ip_address.c
--- packetdrill.orig/gtests/net/packetdrill/ip_address.c	2014-08-18 12:39:13.610794246 +0400
+++ packetdrill/gtests/net/packetdrill/ip_address.c	2014-08-18 12:38:05.170795877 +0400
@@ -168,7 +168,7 @@
 {
 	struct sockaddr_in sa_v4;
