diff options
| author | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /include/linux/if_link.h | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/if_link.h')
| -rw-r--r-- | include/linux/if_link.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 84c3492ae5cb..f9032c88716a 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h | |||
| @@ -79,6 +79,7 @@ enum | |||
| 79 | IFLA_LINKINFO, | 79 | IFLA_LINKINFO, |
| 80 | #define IFLA_LINKINFO IFLA_LINKINFO | 80 | #define IFLA_LINKINFO IFLA_LINKINFO |
| 81 | IFLA_NET_NS_PID, | 81 | IFLA_NET_NS_PID, |
| 82 | IFLA_IFALIAS, | ||
| 82 | __IFLA_MAX | 83 | __IFLA_MAX |
| 83 | }; | 84 | }; |
| 84 | 85 | ||