[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

Mike Christie michaelc at cs.wisc.edu
Sat Apr 7 15:43:36 UTC 2012


The following commit has been merged in the upstream-mnc branch:
commit a040a0bcd8637d0adf5da580e90e948006137fce
Author: Jim Ramsay <jim_ramsay at dell.com>
Date:   Wed Jul 20 09:06:42 2011 -0400

    Fix dcb_app.c compile error with old kernels
    
    Linux kernels 2.6.28 and earlier do not have RTM_GETDCB or RTM_SETDCB
    defined in their rtnetlink.h.  Defining them in dcb_app.c should be safe
    since they have not changed their numerical value since they were
    introduced in 2.6.29.
    
    Signed-off-by: Jim Ramsay <jim_ramsay at dell.com>

diff --git a/usr/dcb_app.c b/usr/dcb_app.c
index 78a5cd1..c31e2b8 100644
--- a/usr/dcb_app.c
+++ b/usr/dcb_app.c
@@ -38,6 +38,14 @@
 #include "dcb_app.h"
 #include "sysfs.h"
 
+/* Older kernels' rtnetlink.h may not have RTM_[GS]ETDCB */
+#ifndef RTM_GETDCB
+# define RTM_GETDCB 78
+#endif
+#ifndef RTM_SETDCB
+# define RTM_SETDCB 79
+#endif
+
 #define IEEE_SMASK_ETHTYPE	(1 << IEEE_8021QAZ_APP_SEL_ETHERTYPE)
 #define IEEE_SMASK_STREAM	(1 << IEEE_8021QAZ_APP_SEL_STREAM)
 #define IEEE_SMASK_DGRAM	(1 << IEEE_8021QAZ_APP_SEL_DGRAM)

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list