From 024c9d6c6594431f4fc80dd6a5e2faa1534e508b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 20 Nov 2006 17:22:26 -0800
Subject: [PATCH] --- yaml --- r: 41835 b: refs/heads/master c:
 74af924ab6562717ef9aab1061ec05bbbf31d979 h: refs/heads/master i:   41833:
 45f954eb9ccda00db16946cec831ec0067f815e6   41831:
 122f5dfa8bc888c9a60b01cff33687d1e2c51265 v: v3

---
 [refs]                           | 2 +-
 trunk/include/net/sctp/structs.h | 1 -
 trunk/net/sctp/bind_addr.c       | 2 --
 trunk/net/sctp/ipv6.c            | 1 -
 trunk/net/sctp/protocol.c        | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 052ada3146ad..e08e7ebc089c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ae955cffdb96190c2bd4f57313f5f147f87854b
+refs/heads/master: 74af924ab6562717ef9aab1061ec05bbbf31d979
diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h
index 9bb5c038b95a..bb857957a88a 100644
--- a/trunk/include/net/sctp/structs.h
+++ b/trunk/include/net/sctp/structs.h
@@ -757,7 +757,6 @@ const union sctp_addr *sctp_source(const struct sctp_chunk *chunk);
 struct sctp_sockaddr_entry {
 	struct list_head list;
 	union sctp_addr a;
-	union sctp_addr a_h;
 	__u8 use_as_src;
 };
 
diff --git a/trunk/net/sctp/bind_addr.c b/trunk/net/sctp/bind_addr.c
index d6664dd30e56..00994158e496 100644
--- a/trunk/net/sctp/bind_addr.c
+++ b/trunk/net/sctp/bind_addr.c
@@ -163,8 +163,6 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
 	if (!addr->a.v4.sin_port)
 		addr->a.v4.sin_port = htons(bp->port);
 
-	flip_to_h(&addr->a_h, &addr->a);
-
 	addr->use_as_src = use_as_src;
 
 	INIT_LIST_HEAD(&addr->list);
diff --git a/trunk/net/sctp/ipv6.c b/trunk/net/sctp/ipv6.c
index b3fa426bd1dc..04d5e13e9183 100644
--- a/trunk/net/sctp/ipv6.c
+++ b/trunk/net/sctp/ipv6.c
@@ -336,7 +336,6 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
 			addr->a.v6.sin6_port = 0;
 			addr->a.v6.sin6_addr = ifp->addr;
 			addr->a.v6.sin6_scope_id = dev->ifindex;
-			addr->a_h = addr->a;
 			INIT_LIST_HEAD(&addr->list);
 			list_add_tail(&addr->list, addrlist);
 		}
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index c20f05b3308f..807c97da33a5 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/net/sctp/protocol.c
@@ -153,7 +153,6 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist,
 			addr->a.v4.sin_family = AF_INET;
 			addr->a.v4.sin_port = 0;
 			addr->a.v4.sin_addr.s_addr = ifa->ifa_local;
-			addr->a_h = addr->a;
 			list_add_tail(&addr->list, addrlist);
 		}
 	}