Merge branch 'netdev-name'
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Jul 2014 18:43:58 +0000 (11:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Jul 2014 18:43:58 +0000 (11:43 -0700)
commit772e7023e61f32c8c334d420c6ce0ab1535dd080
tree8be53cca32ce634c291589f161684913f42432ac
parent9d7e3ea73c6be20538a69c14ab8bfb3b36f8d1a8
parent9c5ff24f963919965155cf0c4a2323b22a0c5c84
Merge branch 'netdev-name'

Cong Wang says:

====================
net: forbid net devices named "all" "default" or "config"

/proc/sys/net/ipv[46]/conf/<dev> could conflict with
/proc/sys/net/ipv[46]/conf/(all|default). And /proc/net/vlan/<dev>
could conflict with /proc/net/vlan/config. Besides kernel warnings,
undefined behavior such as duplicated proc files also appears, therefore
we should forbid these names.

v2: introduce a helper function, suggested by Florian
    fix error handling for ipv6_add_dev() in addrconf_init()
====================

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