summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Pei <huangpei@loongson.cn>2021-11-23 19:07:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-08 19:00:59 +0100
commit6258691830e94be1ba631e4b9ccdfa9520ce6243 (patch)
tree68e9e1e866a55942bf0b29e90b0522566dece79e
parent19f132730d147d587dbe1133571e58d1f8c38f09 (diff)
downloadlinux-stable-6258691830e94be1ba631e4b9ccdfa9520ce6243.tar.gz
linux-stable-6258691830e94be1ba631e4b9ccdfa9520ce6243.tar.bz2
linux-stable-6258691830e94be1ba631e4b9ccdfa9520ce6243.zip
hamradio: fix macro redefine warning
commit 16517829f2e02f096fb5ea9083d160381127faf3 upstream. MIPS/IA64 define END as assembly function ending, which conflict with END definition in mkiss.c, just undef it at first Reported-by: lkp@intel.com Signed-off-by: Huang Pei <huangpei@loongson.cn> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/hamradio/mkiss.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 8d85cedb4bf5..cbf959e7bbff 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -41,6 +41,8 @@
#define AX_MTU 236
+/* some arch define END as assembly function ending, just undef it */
+#undef END
/* SLIP/KISS protocol characters. */
#define END 0300 /* indicates end of frame */
#define ESC 0333 /* indicates byte stuffing */