Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / net / sctp / protocol.c

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 0f41b05bd4d600e7bb62d6de4fdac662fd99138b..5027b83f1cc0c840f6015bb9418356ae61c17242 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -490,7 +490,7 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
                          __func__, &fl.fl4_dst, &fl.fl4_src);
 
        if (!ip_route_output_key(&init_net, &rt, &fl)) {
-               dst = &rt->u.dst;
+               dst = &rt->dst;
        }
 
        /* If there is no association or if a source address is passed, no
@@ -534,7 +534,7 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
                        fl.fl4_src = laddr->a.v4.sin_addr.s_addr;
                        fl.fl_ip_sport = laddr->a.v4.sin_port;
                        if (!ip_route_output_key(&init_net, &rt, &fl)) {
-                               dst = &rt->u.dst;
+                               dst = &rt->dst;
                                goto out_unlock;
                        }
                }
@@ -1002,7 +1002,8 @@ int sctp_register_pf(struct sctp_pf *pf, sa_family_t family)
 static inline int init_sctp_mibs(void)
 {
        return snmp_mib_init((void __percpu **)sctp_statistics,
-                            sizeof(struct sctp_mib));
+                            sizeof(struct sctp_mib),
+                            __alignof__(struct sctp_mib));
 }
 
 static inline void cleanup_sctp_mibs(void)