From 76e2c75b95db98ab2e5db1c94435c80370d718f3 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 20 Mar 2006 22:55:02 -0800 Subject: [PATCH] --- yaml --- r: 22311 b: refs/heads/master c: 74ca4e5acd7d09a5133bb75043c2c474347f2c7e h: refs/heads/master i: 22309: 86bf05005c7682bc0f15189417f9323dcd56f537 22307: 82afa26488f1d41759e0467b1cf9827650b07c0c 22303: 89b33c7babd4ba0e514f9a1faaa164ade0518087 v: v3 --- [refs] | 2 +- trunk/net/bridge/netfilter/ebtables.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 594a8cadd59f..c213c137e694 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8b2a6c50cacc98c924233a9e474c74c0370b6b8 +refs/heads/master: 74ca4e5acd7d09a5133bb75043c2c474347f2c7e diff --git a/trunk/net/bridge/netfilter/ebtables.c b/trunk/net/bridge/netfilter/ebtables.c index 4b178b4a2a95..997953367204 100644 --- a/trunk/net/bridge/netfilter/ebtables.c +++ b/trunk/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)