From 48d69d83a8c365bade8fb2eabb4166741d8906f2 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sat, 21 Oct 2006 20:24:01 -0700
Subject: [PATCH] --- yaml --- r: 40196 b: refs/heads/master c:
 185b1aa122f87052d9154bb74990bc785372a750 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/dn.h   | 5 -----
 trunk/include/net/flow.h | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 035a9aee01d4..2d855f24356c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 375216ad0c303adeed45281ce82e153d41de679a
+refs/heads/master: 185b1aa122f87052d9154bb74990bc785372a750
diff --git a/trunk/include/net/dn.h b/trunk/include/net/dn.h
index 465b78302782..ac4ce9091747 100644
--- a/trunk/include/net/dn.h
+++ b/trunk/include/net/dn.h
@@ -199,11 +199,6 @@ static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)
 {
 	fl->uli_u.dnports.sport = scp->addrloc;
 	fl->uli_u.dnports.dport = scp->addrrem;
-	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);
-	}
 }
 
 extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
diff --git a/trunk/include/net/flow.h b/trunk/include/net/flow.h
index 3b44d72b27d3..5cda27cd9deb 100644
--- a/trunk/include/net/flow.h
+++ b/trunk/include/net/flow.h
@@ -68,9 +68,6 @@ struct flowi {
 		struct {
 			__le16	sport;
 			__le16	dport;
-			__u8	objnum;
-			__u8	objnamel; /* Not 16 bits since max val is 16 */
-			__u8	objname[16]; /* Not zero terminated */
 		} dnports;
 
 		__be32		spi;