Signed-off-by: Ben Pfaff <b...@nicira.com>
---
lib/lldp/lldpd-structs.h | 5 -----
lib/lldp/lldpd.h | 17 -----------------
lib/ovs-lldp.h | 8 --------
3 files changed, 30 deletions(-)
diff --git a/lib/lldp/lldpd-structs.h b/lib/lldp/lldpd-structs.h
index 0763bb3..d62f37c 100644
--- a/lib/lldp/lldpd-structs.h
+++ b/lib/lldp/lldpd-structs.h
@@ -103,11 +103,6 @@ struct lldpd_port {
struct ovs_list p_isid_vlan_maps; /* Contains "struct
lldpd_aa_isid_vlan_maps_tlv"s. */
};
-/* Used to modify some port related settings */
-struct lldpd_port_set {
- char *ifname;
-};
-
/* Smart mode / Hide mode */
#define SMART_INCOMING_FILTER (1<<0) /* Incoming filtering enabled */
#define SMART_INCOMING_ONE_PROTO (1<<1) /* On reception, keep only 1 proto */
diff --git a/lib/lldp/lldpd.h b/lib/lldp/lldpd.h
index 3aaf790..7fa0bbc 100644
--- a/lib/lldp/lldpd.h
+++ b/lib/lldp/lldpd.h
@@ -26,7 +26,6 @@
#include <stddef.h>
#include <string.h>
#include <sys/types.h>
-#include <sys/un.h>
#include "list.h"
#include "lldpd-structs.h"
#include "lldp-tlv.h"
@@ -34,27 +33,11 @@
#include "openvswitch/vlog.h"
#include "ofpbuf.h"
-#define SYSCONFDIR ""
-#define LLDPD_CTL_SOCKET ""
-#define LLDPCLI_PATH ""
-#define PRIVSEP_USER ""
-#define PRIVSEP_GROUP ""
-#define PRIVSEP_CHROOT ""
-
#define ETHERTYPE_LLDP 0x88cc
-struct event;
-struct event_base;
-
#define LLDPD_TX_INTERVAL 5
#define LLDPD_TX_HOLD 4
#define LLDPD_TTL LLDPD_TX_INTERVAL * LLDPD_TX_HOLD
-#define LLDPD_TX_MSGDELAY 1
-#define LLDPD_MAX_NEIGHBORS 4
-#define LLDPD_FAST_TX_INTERVAL 1
-#define LLDPD_FAST_INIT 4
-
-#define USING_AGENTX_SUBAGENT_MODULE 1
#define PROTO_SEND_SIG struct lldpd *, struct lldpd_hardware *,struct ofpbuf *
#define PROTO_DECODE_SIG struct lldpd *, char *, int, struct lldpd_hardware *,\
diff --git a/lib/ovs-lldp.h b/lib/ovs-lldp.h
index 7ef7cca..519b4ad 100644
--- a/lib/ovs-lldp.h
+++ b/lib/ovs-lldp.h
@@ -23,24 +23,16 @@
#include "list.h"
#include "lldp/lldpd.h"
#include "ofpbuf.h"
-#include "ovsdb-data.h"
-#include "ovs-thread.h"
#include "packets.h"
#include "timer.h"
/* Transmit every LLDPD_TX_INTERVAL seconds. */
#define LLDP_DEFAULT_TRANSMIT_INTERVAL_MS LLDPD_TX_INTERVAL * 1000
-struct flow_wildcards;
struct flow;
struct netdev;
struct smap;
-struct lldp_status {
- /* TODO should reflect lldp stack detail */
- char *stackdetail; /* Added because MSVC doesn't like empty structs */
-};
-
/* Structure per LLDP instance (at the moment per port when enabled).
*/
struct lldp {
--
2.1.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
