Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / include / linux / if_link.h

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 422084d18ce1af9162d4c40ceead599f1094bcd4..f9032c88716a6c3d937adcdff70a3679e89bb887 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -78,6 +78,8 @@ enum
        IFLA_LINKMODE,
        IFLA_LINKINFO,
 #define IFLA_LINKINFO IFLA_LINKINFO
+       IFLA_NET_NS_PID,
+       IFLA_IFALIAS,
        __IFLA_MAX
 };