2 files changed, 26 insertions, 2 deletions

diff --git a/br-nf-bds/linux/net/ipv4/netfilter/ip_tables.c b/br-nf-bds/linux/net/ipv4/netfilter/ip_tables.c
index b9f47ea..53afb3b 100644
--- a/br-nf-bds/linux/net/ipv4/netfilter/ip_tables.c
+++ b/br-nf-bds/linux/net/ipv4/netfilter/ip_tables.c
@@ -122,15 +122,19 @@ static LIST_HEAD(ipt_tables);
 static inline int
 ip_packet_match(const struct iphdr *ip,
 		const char *indev,
+#ifdef CONFIG_BRIDGE_NF
 		const char *physindev,
+#endif
 		const char *outdev,
+#ifdef CONFIG_BRIDGE_NF
 		const char *physoutdev,
+#endif
 		const struct ipt_ip *ipinfo,
 		int isfrag)
 {
 	size_t i;
 	unsigned long ret;
-	unsigned long ret2;
+	unsigned long ret2 = 1;
 
 #define FWINV(bool,invflg) ((bool) ^ !!(ipinfo->invflags & invflg))
 
@@ -160,11 +164,13 @@ ip_packet_match(const struct iphdr *ip,
 			& ((const unsigned long *)ipinfo->iniface_mask)[i];
 	}
 
+#ifdef CONFIG_BRIDGE_NF
 	for (i = 0, ret2 = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) {
 		ret2 |= (((const unsigned long *)physindev)[i]
 			^ ((const unsigned long *)ipinfo->iniface)[i])
 			& ((const unsigned long *)ipinfo->iniface_mask)[i];
 	}
+#endif
 
 	if (FWINV(ret != 0 && ret2 != 0, IPT_INV_VIA_IN)) {
 		dprintf("VIA in mismatch (%s vs %s).%s\n",
@@ -179,11 +185,13 @@ ip_packet_match(const struct iphdr *ip,
 			& ((const unsigned long *)ipinfo->outiface_mask)[i];
 	}
 
+#ifdef CONFIG_BRIDGE_NF
 	for (i = 0, ret2 = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) {
 		ret2 |= (((const unsigned long *)physoutdev)[i]
 			^ ((const unsigned long *)ipinfo->outiface)[i])
 			& ((const unsigned long *)ipinfo->outiface_mask)[i];
 	}
+#endif
 
 	if (FWINV(ret != 0 && ret2 != 0, IPT_INV_VIA_OUT)) {
 		dprintf("VIA out mismatch (%s vs %s).%s\n",
@@ -284,7 +292,9 @@ ipt_do_table(struct sk_buff **pskb,
 	/* Initializing verdict to NF_DROP keeps gcc happy. */
 	unsigned int verdict = NF_DROP;
 	const char *indev, *outdev;
+#ifdef CONFIG_BRIDGE_NF
 	const char *physindev, *physoutdev;
+#endif
 	void *table_base;
 	struct ipt_entry *e, *back;
 
@@ -294,8 +304,10 @@ ipt_do_table(struct sk_buff **pskb,
 	datalen = (*pskb)->len - ip->ihl * 4;
 	indev = in ? in->name : nulldevname;
 	outdev = out ? out->name : nulldevname;
+#ifdef CONFIG_BRIDGE_NF
 	physindev = (*pskb)->physindev ? (*pskb)->physindev->name : nulldevname;
 	physoutdev = (*pskb)->physoutdev ? (*pskb)->physoutdev->name : nulldevname;
+#endif
 
 	/* We handle fragments by dealing with the first fragment as
 	 * if it was a normal packet.  All other fragments are treated
@@ -332,7 +344,15 @@ ipt_do_table(struct sk_buff **pskb,
 		IP_NF_ASSERT(e);
 		IP_NF_ASSERT(back);
 		(*pskb)->nfcache |= e->nfcache;
-		if (ip_packet_match(ip, indev, physindev, outdev, physoutdev, &e->ip, offset)) {
+		if (ip_packet_match(ip, indev,
+#ifdef CONFIG_BRIDGE_NF
+		    physindev,
+#endif
+		    outdev,
+#ifdef CONFIG_BRIDGE_NF
+		    physoutdev,
+#endif
+		    &e->ip, offset)) {
 			struct ipt_entry_target *t;
 
 			if (IPT_MATCH_ITERATE(e, do_match,
diff --git a/br-nf-bds/linux/net/ipv4/netfilter/ipt_LOG.c b/br-nf-bds/linux/net/ipv4/netfilter/ipt_LOG.c
index 48bb12f..2c90f1b 100644
--- a/br-nf-bds/linux/net/ipv4/netfilter/ipt_LOG.c
+++ b/br-nf-bds/linux/net/ipv4/netfilter/ipt_LOG.c
@@ -286,11 +286,15 @@ ipt_log_target(struct sk_buff **pskb,
 	spin_lock_bh(&log_lock);
 	printk(level_string);
 	printk("%sIN=%s ", loginfo->prefix, in ? in->name : "");
+#ifdef CONFIG_BRIDGE_NF
 	if ((*pskb)->physindev && in != (*pskb)->physindev)
 		printk("PHYSIN=%s ", (*pskb)->physindev->name);
+#endif
 	printk("OUT=%s ", out ? out->name : "");
+#ifdef CONFIG_BRIDGE_NF
 	if ((*pskb)->physoutdev && out != (*pskb)->physoutdev)
 		printk("PHYSOUT=%s ", (*pskb)->physoutdev->name);
+#endif
 
 	if (in && !out) {
 		/* MAC logging for input chain only. */