|
 |
8a9875 |
From 80fb9db6598440d3af6bdcbcd4f6788f7e660bbe Mon Sep 17 00:00:00 2001
|
|
|
89f6b3 |
From: Chris Leech <cleech@redhat.com>
|
|
|
89f6b3 |
Date: Wed, 17 Jun 2015 10:40:34 -0700
|
|
|
89f6b3 |
Subject: [PATCH] fix build warnings
|
|
|
89f6b3 |
|
|
|
89f6b3 |
---
|
|
|
89f6b3 |
include/lldp_8021qaz.h | 6 ------
|
|
|
8a9875 |
lldp/agent.c | 5 +++++
|
|
|
8a9875 |
lldp/agent.h | 6 +++---
|
|
|
89f6b3 |
lldp_util.c | 4 ++--
|
|
|
8a9875 |
4 files changed, 10 insertions(+), 11 deletions(-)
|
|
|
89f6b3 |
|
|
|
89f6b3 |
diff --git a/include/lldp_8021qaz.h b/include/lldp_8021qaz.h
|
|
|
89f6b3 |
index 55353b8..09dee20 100644
|
|
|
89f6b3 |
--- a/include/lldp_8021qaz.h
|
|
|
89f6b3 |
+++ b/include/lldp_8021qaz.h
|
|
|
89f6b3 |
@@ -218,9 +218,6 @@ int ieee8021qaz_mod_app(struct app_tlv_head *head, int peer,
|
|
|
89f6b3 |
u8 prio, u8 sel, u16 proto, u32 ops);
|
|
|
89f6b3 |
int ieee8021qaz_app_sethw(char *ifname, struct app_tlv_head *head);
|
|
|
89f6b3 |
|
|
|
89f6b3 |
-inline int get_prio_map(u32 prio_map, int tc);
|
|
|
89f6b3 |
-inline void set_prio_map(u32 *prio_map, u8 prio, int tc);
|
|
|
89f6b3 |
-
|
|
|
89f6b3 |
struct ieee8021qaz_tlvs *ieee8021qaz_data(const char *);
|
|
|
89f6b3 |
|
|
|
89f6b3 |
int ieee8021qaz_tlvs_rxed(const char *ifname);
|
|
|
89f6b3 |
@@ -234,9 +231,6 @@ int ieee8021qaz_rchange(struct port *port, struct lldp_agent *,
|
|
|
89f6b3 |
void ieee8021qaz_ifup(char *ifname, struct lldp_agent *);
|
|
|
89f6b3 |
void ieee8021qaz_ifdown(char *ifname, struct lldp_agent *);
|
|
|
89f6b3 |
u8 ieee8021qaz_mibDeleteObject(struct port *port, struct lldp_agent *);
|
|
|
89f6b3 |
-inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from,
|
|
|
89f6b3 |
- socklen_t fromlen, char *ibuf, int ilen,
|
|
|
89f6b3 |
- char *rbuf);
|
|
|
89f6b3 |
int ieee8021qaz_check_operstate(void);
|
|
|
89f6b3 |
int get_dcbx_hw(const char *ifname, __u8 *dcbx);
|
|
|
89f6b3 |
|
|
|
8a9875 |
diff --git a/lldp/agent.c b/lldp/agent.c
|
|
|
8a9875 |
index 73ab054..333929a 100644
|
|
|
8a9875 |
--- a/lldp/agent.c
|
|
|
8a9875 |
+++ b/lldp/agent.c
|
|
|
8a9875 |
@@ -36,6 +36,11 @@
|
|
|
8a9875 |
#include "lldp_mand_clif.h"
|
|
|
8a9875 |
#include "lldp/agent.h"
|
|
|
8a9875 |
|
|
|
8a9875 |
+/* IEEE 802.1AB-2009 - Table 7-1: group MAC addresses used by LLDP */
|
|
|
8a9875 |
+const u8 nearest_bridge[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x0e};
|
|
|
8a9875 |
+const u8 nearest_nontpmr_bridge[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x03};
|
|
|
8a9875 |
+const u8 nearest_customer_bridge[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x00};
|
|
|
8a9875 |
+
|
|
|
8a9875 |
static const u8 * agent_groupmacs[AGENT_MAX] = {
|
|
|
8a9875 |
nearest_bridge,
|
|
|
8a9875 |
nearest_nontpmr_bridge,
|
|
|
8a9875 |
diff --git a/lldp/agent.h b/lldp/agent.h
|
|
|
8a9875 |
index a54f72f..90da3e0 100644
|
|
|
8a9875 |
--- a/lldp/agent.h
|
|
|
8a9875 |
+++ b/lldp/agent.h
|
|
|
8a9875 |
@@ -48,9 +48,9 @@ enum agent_type {
|
|
|
8a9875 |
};
|
|
|
8a9875 |
|
|
|
8a9875 |
/* IEEE 802.1AB-2009 - Table 7-1: group MAC addresses used by LLDP */
|
|
|
8a9875 |
-static const u8 nearest_bridge[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x0e};
|
|
|
8a9875 |
-static const u8 nearest_nontpmr_bridge[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x03};
|
|
|
8a9875 |
-static const u8 nearest_customer_bridge[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x00};
|
|
|
8a9875 |
+extern const u8 nearest_bridge[ETH_ALEN];
|
|
|
8a9875 |
+extern const u8 nearest_nontpmr_bridge[ETH_ALEN];
|
|
|
8a9875 |
+extern const u8 nearest_customer_bridge[ETH_ALEN];
|
|
|
8a9875 |
|
|
|
8a9875 |
struct agenttimers {
|
|
|
8a9875 |
/* Tx */
|
|
|
89f6b3 |
diff --git a/lldp_util.c b/lldp_util.c
|
|
|
8a9875 |
index 62f0af8..f12d46b 100644
|
|
|
89f6b3 |
--- a/lldp_util.c
|
|
|
89f6b3 |
+++ b/lldp_util.c
|
|
|
8a9875 |
@@ -1197,7 +1197,7 @@ int check_link_status(const char *ifname)
|
|
|
89f6b3 |
int get_arg_val_list(char *ibuf, int ilen, int *ioff,
|
|
|
89f6b3 |
char **args, char **argvals)
|
|
|
89f6b3 |
{
|
|
|
89f6b3 |
- u8 arglen;
|
|
|
89f6b3 |
+ u8 arglen = 0;
|
|
|
89f6b3 |
u16 argvalue_len;
|
|
|
89f6b3 |
int *arglens = NULL;
|
|
|
89f6b3 |
int *argvallens = NULL;
|
|
|
8a9875 |
@@ -1265,7 +1265,7 @@ int get_arg_val_list(char *ibuf, int ilen, int *ioff,
|
|
|
89f6b3 |
|
|
|
89f6b3 |
int get_arg_list(char *ibuf, int ilen, int *ioff, char **args)
|
|
|
89f6b3 |
{
|
|
|
89f6b3 |
- u8 arglen;
|
|
|
89f6b3 |
+ u8 arglen = 0;
|
|
|
89f6b3 |
int *arglens = NULL;
|
|
|
89f6b3 |
int *p;
|
|
|
89f6b3 |
int numargs;
|
|
|
89f6b3 |
--
|
|
|
8a9875 |
2.5.5
|
|
|
89f6b3 |
|