diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
| commit | 39c853ebfe169f187a760b34f9cbf54751bfce00 (patch) | |
| tree | 2a5a741d0cff7d4f90998b31b32ff80cfccd0369 /include/net/dn_neigh.h | |
| parent | sg_start_req(): use import_iovec() (diff) | |
| parent | new helper: msg_data_left() (diff) | |
| download | linux-dev-39c853ebfe169f187a760b34f9cbf54751bfce00.tar.xz linux-dev-39c853ebfe169f187a760b34f9cbf54751bfce00.zip | |
Merge branch 'for-davem' into for-next
Diffstat (limited to 'include/net/dn_neigh.h')
| -rw-r--r-- | include/net/dn_neigh.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/dn_neigh.h b/include/net/dn_neigh.h index fac4e3f4a6d3..0f26aa707e62 100644 --- a/include/net/dn_neigh.h +++ b/include/net/dn_neigh.h @@ -22,6 +22,7 @@ int dn_neigh_router_hello(struct sk_buff *skb); int dn_neigh_endnode_hello(struct sk_buff *skb); void dn_neigh_pointopoint_hello(struct sk_buff *skb); int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n); +int dn_to_neigh_output(struct sk_buff *skb); extern struct neigh_table dn_neigh_table; |