Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278332
b: refs/heads/master
c: 263ba61
h: refs/heads/master
v: v3
  • Loading branch information
Pravin B Shelar authored and Jesse Gross committed Dec 3, 2011
1 parent 01f1fd7 commit 6610084
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 109 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 04a6f4417bfd17c3860e8fb37387cb78265ffe44
refs/heads/master: 263ba61d3b19508dfb003c215ec5d23f882b4f87
2 changes: 2 additions & 0 deletions trunk/include/net/genetlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions trunk/include/net/ndisc.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,13 @@ int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl,
extern void inet6_ifinfo_notify(int event,
struct inet6_dev *idev);

static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const struct in6_addr *addr)
{

if (dev)
return __neigh_lookup_errno(&nd_tbl, addr, dev);

return ERR_PTR(-ENODEV);
}

#endif
Loading

0 comments on commit 6610084

Please sign in to comment.