projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[linux-2.6-block.git]
/
include
/
linux
/
rtnetlink.h
diff --git
a/include/linux/rtnetlink.h
b/include/linux/rtnetlink.h
index 2da5d1081ad990b57a07715ea0751ae10a80ac54..7b8e260c4a27df00b8eca70d5cd4f52864ba6d87 100644
(file)
--- a/
include/linux/rtnetlink.h
+++ b/
include/linux/rtnetlink.h
@@
-122,5
+122,5
@@
extern int ndo_dflt_fdb_del(struct ndmsg *ndm,
extern int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u16 mode,
- u32 flags, u32 mask);
+ u32 flags, u32 mask
, int nlflags
);
#endif /* __LINUX_RTNETLINK_H */