git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
if_link.h
diff --git
a/include/linux/if_link.h
b/include/linux/if_link.h
index 422084d18ce1af9162d4c40ceead599f1094bcd4..84c3492ae5cb510604c50dc4ba09941ac95f7300 100644
(file)
--- a/
include/linux/if_link.h
+++ b/
include/linux/if_link.h
@@
-78,6
+78,7
@@
enum
IFLA_LINKMODE,
IFLA_LINKINFO,
#define IFLA_LINKINFO IFLA_LINKINFO
+ IFLA_NET_NS_PID,
__IFLA_MAX
};