Message ID | 20211123110749.15310-1-huangpei@loongson.cn (mailing list archive) |
---|---|
State | Accepted |
Commit | 16517829f2e02f096fb5ea9083d160381127faf3 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [1/2] hamradio: fix macro redefine warning | expand |
Hello: This series was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Tue, 23 Nov 2021 19:07:48 +0800 you wrote: > 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> > --- > drivers/net/hamradio/mkiss.c | 2 ++ > 1 file changed, 2 insertions(+) Here is the summary with links: - [1/2] hamradio: fix macro redefine warning https://git.kernel.org/netdev/net/c/16517829f2e0 - [2/2] slip: fix macro redefine warning https://git.kernel.org/netdev/net/c/e5b40668e930 You are awesome, thank you!
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index e2b332b54f06..7da2bb8a443c 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c @@ -31,6 +31,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 */
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> --- drivers/net/hamradio/mkiss.c | 2 ++ 1 file changed, 2 insertions(+)