Merge branch 'noprefixroute'
authorDavid S. Miller <davem@davemloft.net>
Thu, 16 Jan 2014 01:00:47 +0000 (17:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Jan 2014 01:00:47 +0000 (17:00 -0800)
commite5d640239fbb3a543b6151d49656b7573b940fdf
treea1487e383ad39c19412bd2c3c3fa3a91f4f3963a
parent6631c5cea8687cf4d36327fdbceb0691cd5d2e29
parent5b84efecb7d939d06790b7bace5e513537d0767c
Merge branch 'noprefixroute'

Thomas Haller says:

====================
ipv6 addrconf: add IFA_F_NOPREFIXROUTE flag to suppress creation of IP6 routes

v1 -> v2: add a second commit, handling NOPREFIXROUTE in ip6_del_addr.
v2 -> v3: reword commit messages, code comments and some refactoring.
v3 -> v4: refactor, rename variables, add enum
v4 -> v5: rebase, so that patch applies cleanly to current net-next/master
====================

Signed-off-by: David S. Miller <davem@davemloft.net>