113 lines
3.5 KiB
Diff
113 lines
3.5 KiB
Diff
From 68c411e5a1638b4d38d9ea6c008b66bbad03d761 Mon Sep 17 00:00:00 2001
|
|
From: John Fastabend <john.r.fastabend@intel.com>
|
|
Date: Wed, 6 Apr 2011 08:47:35 -0700
|
|
Subject: [PATCH 38/51] lldpad: FCoE app data never sent to kernel
|
|
|
|
Remove ifdefs around netlink code. Because these defines were
|
|
never set the app data was not being sent to the kernel. After
|
|
removing the defines there were some compile errors that
|
|
needed to be fixed.
|
|
|
|
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
|
|
Signed-off-by: Petr Sabata <psabata@redhat.com>
|
|
---
|
|
dcb_protocol.c | 5 ++---
|
|
include/dcb_driver_interface.h | 4 ----
|
|
lldp_dcbx_nl.c | 4 ----
|
|
3 files changed, 2 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/dcb_protocol.c b/dcb_protocol.c
|
|
index ee07e5d..6a91574 100644
|
|
--- a/dcb_protocol.c
|
|
+++ b/dcb_protocol.c
|
|
@@ -42,6 +42,7 @@
|
|
#include "tlv_dcbx.h"
|
|
#include "lldp_rtnl.h"
|
|
#include "linux/if.h"
|
|
+#include "linux/dcbnl.h"
|
|
|
|
static void handle_opermode_true(char *device_name);
|
|
u8 gdcbx_subtype = dcbx_subtype2;
|
|
@@ -2754,13 +2755,13 @@ int set_configuration(char *device_name, u32 EventFlag)
|
|
DCB_TEST_FLAGS(EventFlag, DCB_REMOTE_CHANGE_LLINK,
|
|
DCB_REMOTE_CHANGE_LLINK)) {
|
|
return dcb_success;
|
|
-#ifdef DCB_APP_DRV_IF_SUPPORTED
|
|
} else if (DCB_TEST_FLAGS(EventFlag,
|
|
DCB_LOCAL_CHANGE_APPTLV(APP_FCOE_STYPE),
|
|
DCB_LOCAL_CHANGE_APPTLV(APP_FCOE_STYPE)) ||
|
|
DCB_TEST_FLAGS(EventFlag,
|
|
DCB_REMOTE_CHANGE_APPTLV(APP_FCOE_STYPE),
|
|
DCB_REMOTE_CHANGE_APPTLV(APP_FCOE_STYPE))) {
|
|
+ appgroup_attribs app_data;
|
|
|
|
/* Get Oper store */
|
|
app_it Oper = apptlv_find(&oper_apptlv, device_name,
|
|
@@ -2768,7 +2769,6 @@ int set_configuration(char *device_name, u32 EventFlag)
|
|
if (Oper == NULL)
|
|
return dcb_success;
|
|
|
|
- appgroup_attribs app_data;
|
|
app_data.dcb_app_idtype = DCB_APP_IDTYPE_ETHTYPE;
|
|
app_data.dcb_app_id = APP_FCOE_ETHTYPE;
|
|
app_data.dcb_app_priority = Oper->second->AppData[0];
|
|
@@ -2788,7 +2788,6 @@ int set_configuration(char *device_name, u32 EventFlag)
|
|
}
|
|
return set_hw_app1(device_name, Oper->second->AppData[0],
|
|
Local->second->protocol.OperMode);
|
|
-#endif /* DCB_APP_DRV_IF_SUPPORTED */
|
|
}
|
|
return dcb_success;
|
|
}
|
|
diff --git a/include/dcb_driver_interface.h b/include/dcb_driver_interface.h
|
|
index 0e681f8..17050fe 100644
|
|
--- a/include/dcb_driver_interface.h
|
|
+++ b/include/dcb_driver_interface.h
|
|
@@ -33,21 +33,17 @@ typedef struct pgroup_attribs {
|
|
dcb_traffic_attribs_type rx;
|
|
} pgroup_attribs;
|
|
|
|
-#ifdef DCB_APP_DRV_IF_SUPPORTED
|
|
typedef struct appgroup_attribs {
|
|
u8 dcb_app_idtype;
|
|
u16 dcb_app_id;
|
|
u8 dcb_app_priority;
|
|
} appgroup_attribs;
|
|
-#endif
|
|
|
|
int set_hw_pg(char *device_name, pgroup_attribs *pg_data, bool Opermode);
|
|
int set_hw_pfc(char *device_name, dcb_pfc_list_type pfc_data, bool Opermode);
|
|
|
|
-#ifdef DCB_APP_DRV_IF_SUPPORTED
|
|
int set_hw_app0(char *device_name, appgroup_attribs *app_data);
|
|
int set_hw_app1(char *device_name, u8 priority, int mode);
|
|
-#endif /* DCB_APP_DRV_IF_SUPPORTED */
|
|
|
|
int set_hw_all(char *device_name);
|
|
|
|
diff --git a/lldp_dcbx_nl.c b/lldp_dcbx_nl.c
|
|
index e5512df..e4b2830 100644
|
|
--- a/lldp_dcbx_nl.c
|
|
+++ b/lldp_dcbx_nl.c
|
|
@@ -699,9 +699,6 @@ int set_hw_pfc(char *ifname, dcb_pfc_list_type pfc_data,
|
|
return rval;
|
|
}
|
|
|
|
-
|
|
-#ifdef DCB_APP_DRV_IF_SUPPORTED
|
|
-
|
|
/* returns: 0 on success
|
|
* 1 on failure
|
|
*/
|
|
@@ -775,7 +772,6 @@ int set_hw_app1(char *ifname, u8 pri, int mode)
|
|
return(0);
|
|
|
|
}
|
|
-#endif /* DCB_APP_DRV_IF_SUPPORTED */
|
|
|
|
int set_hw_all(char *ifname)
|
|
{
|
|
--
|
|
1.7.4.4
|
|
|