浏览代码

[stp] Fix incorrectly disambiguated errors

The three nominally-disambiguated ENOTSUP errors accidentally all used
the same error disambiguator, rendering them identical.  Fix by
changing all three values.  We avoid reusing the 0x01 disambiguator
value, since that remains ambiguous in older binaries.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 10 年前
父节点
当前提交
8af8886d0a
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3
    3
      src/net/stp.c

+ 3
- 3
src/net/stp.c 查看文件

40
 /* Disambiguate the various error causes */
40
 /* Disambiguate the various error causes */
41
 #define ENOTSUP_PROTOCOL __einfo_error ( EINFO_ENOTSUP_PROTOCOL )
41
 #define ENOTSUP_PROTOCOL __einfo_error ( EINFO_ENOTSUP_PROTOCOL )
42
 #define EINFO_ENOTSUP_PROTOCOL					\
42
 #define EINFO_ENOTSUP_PROTOCOL					\
43
-	__einfo_uniqify ( EINFO_ENOTSUP, 0x01,			\
43
+	__einfo_uniqify ( EINFO_ENOTSUP, 0x02,			\
44
 			  "Non-STP packet received" )
44
 			  "Non-STP packet received" )
45
 #define ENOTSUP_VERSION __einfo_error ( EINFO_ENOTSUP_VERSION )
45
 #define ENOTSUP_VERSION __einfo_error ( EINFO_ENOTSUP_VERSION )
46
 #define EINFO_ENOTSUP_VERSION					\
46
 #define EINFO_ENOTSUP_VERSION					\
47
-	__einfo_uniqify ( EINFO_ENOTSUP, 0x01,			\
47
+	__einfo_uniqify ( EINFO_ENOTSUP, 0x03,			\
48
 			  "Legacy STP packet received" )
48
 			  "Legacy STP packet received" )
49
 #define ENOTSUP_TYPE __einfo_error ( EINFO_ENOTSUP_TYPE )
49
 #define ENOTSUP_TYPE __einfo_error ( EINFO_ENOTSUP_TYPE )
50
 #define EINFO_ENOTSUP_TYPE					\
50
 #define EINFO_ENOTSUP_TYPE					\
51
-	__einfo_uniqify ( EINFO_ENOTSUP, 0x01,			\
51
+	__einfo_uniqify ( EINFO_ENOTSUP, 0x04,			\
52
 			  "Non-RSTP packet received" )
52
 			  "Non-RSTP packet received" )
53
 
53
 
54
 /**
54
 /**

正在加载...
取消
保存