Re: [PATCH rdma-next 3/6] RDMA/hfi1: Avoid redeclaration error

On Tue, Aug 16, 2016 at 05:15:39PM +0000, Dalessandro, Dennis wrote:

On Tue, 2016-08-16 at 16:45 +0300, Leon Romanovsky wrote:

quoted

From: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

Plugging HFI1 IOCTL defines will cause to the following
build error for QIB:
  CC [M] drivers/infiniband/hw/qib/qib_sysfs.o
In file included from ./include/uapi/rdma/rdma_user_ioctl.h:39:0,
		 from include/uapi/rdma/ib_user_mad.h:38,
		 from include/rdma/ib_mad.h:43,
		 from include/rdma/ib_pma.h:38,
		 from drivers/infiniband/hw/qib/qib_mad.h:37,
		 from drivers/infiniband/hw/qib/qib_init.c:49:
./include/uapi/rdma/hfi/hfi1_user.h:370:2: error: redeclaration of
enumerator ‘ur_rcvhdrtail’
  ur_rcvhdrtail = 0,
Move HFI1 structures to separate file to avoid this failure.

I need to look at this some more. So does this mean this patch series
don't build if you just take the first 2?

No, they build perfectly. This patch is needed for next patch "RDMA/core:
Move HFI1 IOCTL declarations to common file".

qib should not need anything
from hfi1_user.h so it should not be including it.

It doesn't include directly, but qib includes ib_user_mad.h, which will
be part of common rdma_user_ioctl.h file. This common file will call to
hfi1_user.h too.

-Denny