summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Pei <huangpei@loongson.cn>2021-11-23 14:07:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-11 14:22:31 +0300
commit668c821321b46b6724e80c2840a46c5212e32d2c (patch)
tree426722663be4c19972e13e489a2529c0b33f0ecc
parentefe3167e52a5833ec20ee6214be9b99b378564a8 (diff)
downloadlinux-668c821321b46b6724e80c2840a46c5212e32d2c.tar.xz
slip: fix macro redefine warning
commit e5b40668e930979bd1e82c7ed7c9029db635f0e4 upstream. MIPS/IA64 define END as assembly function ending, which conflict with END definition in slip.h, 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/slip/slip.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/slip/slip.h b/drivers/net/slip/slip.h
index c420e5948522..3d7f88b330c1 100644
--- a/drivers/net/slip/slip.h
+++ b/drivers/net/slip/slip.h
@@ -40,6 +40,8 @@
insmod -oslip_maxdev=nnn */
#define SL_MTU 296 /* 296; I am used to 600- FvK */
+/* some arch define END as assembly function ending, just undef it */
+#undef END
/* SLIP protocol characters. */
#define END 0300 /* indicates end of frame */
#define ESC 0333 /* indicates byte stuffing */