882bfef32697d44 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Sat, 3 Dec 2016 17:31:45 +0100
Subject: uapi glibc compat: fix outer guard of net device flags enum

Fix a wrong condition preventing the higher net device flags
IFF_LOWER_UP etc to be defined if net/if.h is included before
linux/if.h.

The comment makes it clear the intention was to allow partial
definition with either parts.

This fixes compilation of userspace programs trying to use
IFF_LOWER_UP, IFF_DORMANT or IFF_ECHO.

Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

<td class='main'><a href='/cgit.cgi/'>index</a> : <a href='/cgit.cgi/linux/net-next.git/'>net-next.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>refs</a><a class='active' href='/cgit.cgi/linux/net-next.git/log/include/trace/events/host1x.h'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/include/trace/events/host1x.h?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>tree</a><a href='/cgit.cgi/linux/net-next.git/commit/include/trace/events/host1x.h?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/include/trace/events/host1x.h?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/include/trace/events/host1x.h'>
<input type='hidden' name='id' value='d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/log/?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>root</a>/<a href='/cgit.cgi/linux/net-next.git/log/include?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>include</a>/<a href='/cgit.cgi/linux/net-next.git/log/include/trace?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>trace</a>/<a href='/cgit.cgi/linux/net-next.git/log/include/trace/events?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>events</a>/<a href='/cgit.cgi/linux/net-next.git/log/include/trace/events/host1x.h?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87'>host1x.h</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit.cgi/linux/net-next.git/log/include/trace/events/host1x.h?id=d9c2661e1c8a98583a48f25b24d44ea9fa57fa87&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>