Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[firefly-linux-kernel-4.4.55.git] / include / net / dn.h

diff --git a/include/net/dn.h b/include/net/dn.h
index a514a3cf45730df7083e8c2169e90d3a4bc9084e..298521e0d8a2c1915377f127008225ed39d3dac9 100644 (file)
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -192,10 +192,10 @@ static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr)
        ethaddr[5] = (__u8)(a >> 8);
 }
 
-static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)
+static inline void dn_sk_ports_copy(struct flowidn *fld, struct dn_scp *scp)
 {
-       fl->uli_u.dnports.sport = scp->addrloc;
-       fl->uli_u.dnports.dport = scp->addrrem;
+       fld->fld_sport = scp->addrloc;
+       fld->fld_dport = scp->addrrem;
 }
 
 extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);