diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
| commit | 806834f526784fbddd3795fe435b687897962be5 (patch) | |
| tree | e945c9f6987684b98ee1f7acb104a603624634df /include/net/ndisc.h | |
| parent | 4c1b5fa0d34e0e6a6a5ba54961ea11bb726db69c (diff) | |
| parent | a5b2db67139e991d9e9e19260989d0e66a03a2b2 (diff) | |
Merge commit 'net/master'
Conflicts:
MAINTAINERS
Diffstat (limited to 'include/net/ndisc.h')
| -rw-r--r-- | include/net/ndisc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 59b70624b056..5aedf324de66 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -77,7 +77,7 @@ struct nd_opt_hdr { } __attribute__((__packed__)); -extern int ndisc_init(struct net_proto_family *ops); +extern int ndisc_init(void); extern void ndisc_cleanup(void); @@ -107,7 +107,7 @@ extern int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *d /* * IGMP */ -extern int igmp6_init(struct net_proto_family *ops); +extern int igmp6_init(void); extern void igmp6_cleanup(void); |