diff options
| author | Michael Brown | 2016-01-14 13:39:01 +0100 |
|---|---|---|
| committer | Michael Brown | 2016-01-14 13:39:35 +0100 |
| commit | 8af8886d0aa50fd4e34eb338321b3051257062fe (patch) | |
| tree | f923ef1ee3e0b368730bd2121acb0e0b5076f1d8 | |
| parent | [debug] Allow debug colourisation to be disabled (diff) | |
| download | ipxe-8af8886d0aa50fd4e34eb338321b3051257062fe.tar.gz ipxe-8af8886d0aa50fd4e34eb338321b3051257062fe.tar.xz ipxe-8af8886d0aa50fd4e34eb338321b3051257062fe.zip | |
[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>
| -rw-r--r-- | src/net/stp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/stp.c b/src/net/stp.c index d4e65a1a2..defdaed9e 100644 --- a/src/net/stp.c +++ b/src/net/stp.c @@ -40,15 +40,15 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /* Disambiguate the various error causes */ #define ENOTSUP_PROTOCOL __einfo_error ( EINFO_ENOTSUP_PROTOCOL ) #define EINFO_ENOTSUP_PROTOCOL \ - __einfo_uniqify ( EINFO_ENOTSUP, 0x01, \ + __einfo_uniqify ( EINFO_ENOTSUP, 0x02, \ "Non-STP packet received" ) #define ENOTSUP_VERSION __einfo_error ( EINFO_ENOTSUP_VERSION ) #define EINFO_ENOTSUP_VERSION \ - __einfo_uniqify ( EINFO_ENOTSUP, 0x01, \ + __einfo_uniqify ( EINFO_ENOTSUP, 0x03, \ "Legacy STP packet received" ) #define ENOTSUP_TYPE __einfo_error ( EINFO_ENOTSUP_TYPE ) #define EINFO_ENOTSUP_TYPE \ - __einfo_uniqify ( EINFO_ENOTSUP, 0x01, \ + __einfo_uniqify ( EINFO_ENOTSUP, 0x04, \ "Non-RSTP packet received" ) /** |