From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 30 Jun 2015 00:57:48 +0000 (-1000)
Subject: api: fix compatibility of linux/in.h with netinet/in.h
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~57^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=279c6c7fa64f5763e6b9f05e7ab3840092e702e7;p=pandora-kernel.git

api: fix compatibility of linux/in.h with netinet/in.h

u
This fixes breakage to iproute2 build with recent kernel headers
caused by:
   commit a263653ed798216c0069922d7b5237ca49436007
   Author: Pablo Neira Ayuso <pablo@netfilter.org>
   Date:   Wed Jun 17 10:28:27 2015 -0500

   netfilter: don't pull include/linux/netfilter.h from netns headers

The issue is that definitions in linux/in.h overlap with those
in netinet/in.h. This patch solves this by introducing the same
mechanism as was used to solve the same problem with linux/in6.h

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed