diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-21 07:55:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-21 07:55:02 +0100 |
| commit | 74ca4e5acd7d09a5133bb75043c2c474347f2c7e (patch) | |
| tree | edbdb7d723e21a99c5a4b5b38b533bc581fa86fa /net/bridge | |
| parent | [SPARC]: Fixup SO_PEERSEC value on 32-bit sparc. (diff) | |
| download | linux-74ca4e5acd7d09a5133bb75043c2c474347f2c7e.tar.xz linux-74ca4e5acd7d09a5133bb75043c2c474347f2c7e.zip | |
[BRIDGE] ebtables: Build fix.
net/bridge/netfilter/ebtables.c:1481: warning: initialization makes pointer from integer without a cast
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 4b178b4a2a95..997953367204 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1477,8 +1477,14 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) } static struct nf_sockopt_ops ebt_sockopts = -{ { NULL, NULL }, PF_INET, EBT_BASE_CTL, EBT_SO_SET_MAX + 1, do_ebt_set_ctl, - EBT_BASE_CTL, EBT_SO_GET_MAX + 1, do_ebt_get_ctl, 0, NULL +{ + .pf = PF_INET, + .set_optmin = EBT_BASE_CTL, + .set_optmax = EBT_SO_SET_MAX + 1, + .set = do_ebt_set_ctl, + .get_optmin = EBT_BASE_CTL, + .get_optmax = EBT_SO_GET_MAX + 1, + .get = do_ebt_get_ctl, }; static int __init init(void) |