]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
bridge: fix compile warning in net/bridge/br_netfilter.c
authorRami Rosen <ramirose@gmail.com>
Tue, 5 Aug 2008 08:21:22 +0000 (01:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2008 08:21:22 +0000 (01:21 -0700)
This patch fixes the following warning due to incompatible pointer
assignment:

net/bridge/br_netfilter.c: In function 'br_netfilter_rtable_init':
net/bridge/br_netfilter.c:116: warning: assignment from incompatible
pointer type

This warning is due to commit 4adf0af6818f3ea52421dc0bae836cfaf20ef72a
from July 30 (send correct MTU value in PMTU (revised)).

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_netfilter.c

index 6e280a8a31ee025527463c35381459442f1d4d9f..6a9a6cd74b1efa58e174dc03cab451b88d33be47 100644 (file)
@@ -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;