From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932612AbbE3Tvz (ORCPT ); Sat, 30 May 2015 15:51:55 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:36156 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266AbbE3Tvp (ORCPT ); Sat, 30 May 2015 15:51:45 -0400 Date: Sat, 30 May 2015 21:52:23 +0200 From: Frans Klaver To: Mikko Rapeli Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Subject: Re: [PATCH 49/98] Break dependency loop between linux/if.h and linux/hdlc/ioctl.h Message-ID: <20150530195223.GA15645@bugger.home> References: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> <1433000370-19509-50-git-send-email-mikko.rapeli@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1433000370-19509-50-git-send-email-mikko.rapeli@iki.fi> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, May 30, 2015 at 05:38:41PM +0200, Mikko Rapeli wrote: > This isn't pretty but does the job. I assume including plain linux/hdlc/ioctl.h > without linux/if.h is much more rare than the other way round, and that > these header file names are part of API, and that creating a new header file > just for IFNAMSIZ isn't a good idea either. > > Fixes userspace compiler error: > > error: ‘IFNAMSIZ’ undeclared here (not in a function) > > Signed-off-by: Mikko Rapeli > --- > include/uapi/linux/hdlc/ioctl.h | 5 ++++- > include/uapi/linux/if.h | 4 ++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioctl.h > index 8bbee11..73982ec 100644 > --- a/include/uapi/linux/hdlc/ioctl.h > +++ b/include/uapi/linux/hdlc/ioctl.h > @@ -1,7 +1,10 @@ > #ifndef __HDLC_IOCTL_H__ > #define __HDLC_IOCTL_H__ > > -#include > +/* For breaking dependency loop between if.h and hdlc/ioctl.h */ > +#ifndef IFNAMSIZ > +#define IFNAMSIZ 16 > +#endif > > #define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */ > > diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h > index 9cf2394..e4b130a 100644 > --- a/include/uapi/linux/if.h > +++ b/include/uapi/linux/if.h > @@ -23,6 +23,10 @@ > #include /* for "struct sockaddr" et al */ > #include /* for "__user" et al */ > > +/** > + * IFNAMSIZ is also defined in linux/hdlc/ioctl.h if it does not exists > + * to break dependency loop between linux/if.h and linux/hdlc/ioctl.h. > + */ > #define IFNAMSIZ 16 > #define IFALIASZ 256 > #include This feels backwards to me. Wouldn't it be less funky to accept that IFNAMSIZE isn't defined in if.h, but rather in hdlc/ioctl.h? If now someone feels giddy and does #include #include We have a new and unnecessary warning on our hands ;-) Thanks, Frans