Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[karo-tx-linux.git] / net / netfilter / nf_conntrack_h323_main.c

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 6eaee7c8a3375843eb2631ac1d79d155c2d12c1c..b969025cf82fe35437c20933cf860525eeda3d7d 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -734,11 +734,11 @@ static int callforward_do_filter(const union nf_inet_addr *src,
                if (!afinfo->route((struct dst_entry **)&rt1, &fl1)) {
                        if (!afinfo->route((struct dst_entry **)&rt2, &fl2)) {
                                if (rt1->rt_gateway == rt2->rt_gateway &&
-                                   rt1->u.dst.dev  == rt2->u.dst.dev)
+                                   rt1->dst.dev  == rt2->dst.dev)
                                        ret = 1;
-                               dst_release(&rt2->u.dst);
+                               dst_release(&rt2->dst);
                        }
-                       dst_release(&rt1->u.dst);
+                       dst_release(&rt1->dst);
                }
                break;
        }
@@ -753,11 +753,11 @@ static int callforward_do_filter(const union nf_inet_addr *src,
                        if (!afinfo->route((struct dst_entry **)&rt2, &fl2)) {
                                if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,
                                            sizeof(rt1->rt6i_gateway)) &&
-                                   rt1->u.dst.dev == rt2->u.dst.dev)
+                                   rt1->dst.dev == rt2->dst.dev)
                                        ret = 1;
-                               dst_release(&rt2->u.dst);
+                               dst_release(&rt2->dst);
                        }
-                       dst_release(&rt1->u.dst);
+                       dst_release(&rt1->dst);
                }
                break;
        }