summaryrefslogtreecommitdiffstats
path: root/kernel/linux/net
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/linux/net')
-rw-r--r--kernel/linux/net/bridge/netfilter/ebt_802_3.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/linux/net/bridge/netfilter/ebt_802_3.c b/kernel/linux/net/bridge/netfilter/ebt_802_3.c
index 638753b..08427a5 100644
--- a/kernel/linux/net/bridge/netfilter/ebt_802_3.c
+++ b/kernel/linux/net/bridge/netfilter/ebt_802_3.c
@@ -18,7 +18,6 @@ static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
struct ebt_802_3_hdr *hdr = (struct ebt_802_3_hdr *)skb->mac.ethernet;
uint16_t type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
-
if (info->bitmask & EBT_802_3_SAP) {
if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP))
@@ -26,7 +25,7 @@ static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP))
return EBT_NOMATCH;
}
-
+
if (info->bitmask & EBT_802_3_TYPE) {
if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE))
return EBT_NOMATCH;
@@ -34,11 +33,10 @@ static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
return EBT_NOMATCH;
}
- /* Other matches will go here, when I get around to it */
-
return EBT_MATCH;
}
+static struct ebt_match filter_802_3;
static int ebt_802_3_check(const char *tablename, unsigned int hookmask,
const struct ebt_entry *e, void *data, unsigned int datalen)
{
@@ -54,8 +52,10 @@ static int ebt_802_3_check(const char *tablename, unsigned int hookmask,
static struct ebt_match filter_802_3 =
{
- {NULL, NULL}, EBT_802_3_MATCH, ebt_filter_802_3, ebt_802_3_check, NULL,
- THIS_MODULE
+ .name = EBT_802_3_MATCH,
+ .match = ebt_filter_802_3,
+ .check = ebt_802_3_check,
+ .me = THIS_MODULE,
};
static int __init init(void)
@@ -72,4 +72,3 @@ module_init(init);
module_exit(fini);
EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
-