CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-realtek.c

diff --git a/print-realtek.c b/print-realtek.c
index 2aae3fe46c5ce169563c29aa73783be7f6ecf60f..f32086509497604de195ed9b8b8b9762298324b6 100644 (file)
--- a/print-realtek.c
+++ b/print-realtek.c
@@ -25,9 +25,7 @@
 
 /* \summary: printer for various Realtek protocols */
 
 
 /* \summary: printer for various Realtek protocols */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -117,7 +115,7 @@ rrcp_print(netdissect_options *ndo,
                tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
        if (rrcp_opcode==RRCP_OPCODE_GET_CONFIGURATION ||
            rrcp_opcode==RRCP_OPCODE_SET_CONFIGURATION){
                tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
        if (rrcp_opcode==RRCP_OPCODE_GET_CONFIGURATION ||
            rrcp_opcode==RRCP_OPCODE_SET_CONFIGURATION){

-           ND_PRINT(" addr=0x%04x, data=0x%08x",
+           ND_PRINT(" addr=0x%04x, data=0x%08x",

                     GET_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
        }
                     GET_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
        }