netns: correct mib stats in ip6_route_me_harder()

[linux-2.6-omap-h63xx.git] / net / bridge / br_netfilter.c

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 6e280a8a31ee025527463c35381459442f1d4d9f..a4abed5b4c442cba6bb8e5b5f878c8f063f73b49 100644 (file)
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -113,7 +113,7 @@ void br_netfilter_rtable_init(struct net_bridge *br)
        struct rtable *rt = &br->fake_rtable;
 
        atomic_set(&rt->u.dst.__refcnt, 1);
-       rt->u.dst.dev = &br->dev;
+       rt->u.dst.dev = br->dev;
        rt->u.dst.path = &rt->u.dst;
        rt->u.dst.metrics[RTAX_MTU - 1] = 1500;
        rt->u.dst.flags = DST_NOXFRM;
@@ -657,7 +657,7 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb,
 {
        struct nf_bridge_info *nf_bridge;
        struct net_device *parent;
-       int pf;
+       u_int8_t pf;
 
        if (!skb->nf_bridge)
                return NF_ACCEPT;
@@ -791,7 +791,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb,
 {
        struct nf_bridge_info *nf_bridge = skb->nf_bridge;
        struct net_device *realoutdev = bridge_parent(skb->dev);
-       int pf;
+       u_int8_t pf;
 
 #ifdef CONFIG_NETFILTER_DEBUG
        /* Be very paranoid. This probably won't happen anymore, but let's