diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-12-03 22:53:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-03 22:53:31 -0500 |
| commit | 78a8a36fe0b2cee5a0a7360107815cbcad5b4003 (patch) | |
| tree | 1abf45fa898ed4e31a131328b0e182f29a72300a /include/net | |
| parent | ipv6: Kill ndisc_get_neigh() inline helper. (diff) | |
| parent | net: Add Open vSwitch kernel components. (diff) | |
| download | linux-dev-78a8a36fe0b2cee5a0a7360107815cbcad5b4003.tar.xz linux-dev-78a8a36fe0b2cee5a0a7360107815cbcad5b4003.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/genetlink.h | 2 | ||||
| -rw-r--r-- | include/net/ipv6.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 82d8d09faa44..7db32995ccd3 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h @@ -128,6 +128,8 @@ extern int genl_register_mc_group(struct genl_family *family, struct genl_multicast_group *grp); extern void genl_unregister_mc_group(struct genl_family *family, struct genl_multicast_group *grp); +extern void genl_notify(struct sk_buff *skb, struct net *net, u32 pid, + u32 group, struct nlmsghdr *nlh, gfp_t flags); /** * genlmsg_put - Add generic netlink header to netlink message diff --git a/include/net/ipv6.h b/include/net/ipv6.h index f35188e002d9..e4170a22fc6f 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -558,7 +558,7 @@ extern void ipv6_push_frag_opts(struct sk_buff *skb, u8 *proto); extern int ipv6_skip_exthdr(const struct sk_buff *, int start, - u8 *nexthdrp); + u8 *nexthdrp, __be16 *frag_offp); extern int ipv6_ext_hdr(u8 nexthdr); |