net: use the macros defined for the members of flowi

[net-next-2.6.git] / net / ipv6 / ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 2640c9be589dd62805dab83ed910ba4cbad694d6..9fab274019c0656dd4f01365ac14e46e0f1f764d 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -666,8 +666,7 @@ static int pim6_rcv(struct sk_buff *skb)
 
        skb_tunnel_rx(skb, reg_dev);
 
-       if (netif_rx(skb) == NET_RX_DROP)
-               reg_dev->stats.rx_dropped++;
+       netif_rx(skb);
 
        dev_put(reg_dev);
        return 0;
@@ -1844,9 +1843,7 @@ static int ip6mr_forward2(struct net *net, struct mr6_table *mrt,
 
        fl = (struct flowi) {
                .oif = vif->link,
-               .nl_u = { .ip6_u =
-                               { .daddr = ipv6h->daddr, }
-               }
+               .fl6_dst = ipv6h->daddr,
        };
 
        dst = ip6_route_output(net, NULL, &fl);