Subject: [PATCH] [NET] reduce sizeof(struct flowi) by 20 bytes

From: Eric Dumazet <[email-masked]>
Date: Fri, 20 Oct 2006 15:55:33 +0200

Hi all

As suggested by David, just kill off some unused fields in dnports to reduce 
sizef(struct flowi). If they come back, they should be moved to nl_u.dn_u in 
order not to enlarge again struct flowi

Signed-off-by: Eric Dumazet <[email-masked]>
diff --git a/include/net/dn.h b/include/net/dn.h
index 465b783..c39385b 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -199,11 +199,13 @@ static inline void dn_sk_ports_copy(stru
 {
 	fl->uli_u.dnports.sport = scp->addrloc;
 	fl->uli_u.dnports.dport = scp->addrrem;
+#if 0 /* not yet used */
 	fl->uli_u.dnports.objnum = scp->addr.sdn_objnum;
 	if (fl->uli_u.dnports.objnum == 0) {
 		fl->uli_u.dnports.objnamel = (__u8)dn_ntohs(scp->addr.sdn_objnamel);
 		memcpy(fl->uli_u.dnports.objname, scp->addr.sdn_objname, 16);
 	}
+#endif
 }
 
 extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
diff --git a/include/net/flow.h b/include/net/flow.h
index 3b44d72..bdc0e49 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -68,9 +68,11 @@ #define FLOWI_FLAG_MULTIPATHOLDROUTE 0x0
 		struct {
 			__le16	sport;
 			__le16	dport;
+#if 0 /* not yet used, should move to nl_u.dn_u */
 			__u8	objnum;
 			__u8	objnamel; /* Not 16 bits since max val is 16 */
 			__u8	objname[16]; /* Not zero terminated */
+#endif
 		} dnports;
 
 		__be32		spi;