From 9f20474985b7c658831eb7c1d603eec445227a59 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 2 May 2008 16:53:33 -0700
Subject: [PATCH] --- yaml --- r: 95904 b: refs/heads/master c:
 ae4f8fca4030a4e783fa4ccb0c9d8d8a8cf60a32 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/if_bridge.h | 4 +++-
 trunk/net/bridge/br_fdb.c       | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9877394a5273..e1412f8b81ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 920e37f76b19b4a3d8a1a3144cd6ee24e0e7f5b4
+refs/heads/master: ae4f8fca4030a4e783fa4ccb0c9d8d8a8cf60a32
diff --git a/trunk/include/linux/if_bridge.h b/trunk/include/linux/if_bridge.h
index 58e43e566457..950e13d09e06 100644
--- a/trunk/include/linux/if_bridge.h
+++ b/trunk/include/linux/if_bridge.h
@@ -97,7 +97,9 @@ struct __fdb_entry
 	__u8 port_no;
 	__u8 is_local;
 	__u32 ageing_timer_value;
-	__u32 unused;
+	__u8 port_hi;
+	__u8 pad0;
+	__u16 unused;
 };
 
 #ifdef __KERNEL__
diff --git a/trunk/net/bridge/br_fdb.c b/trunk/net/bridge/br_fdb.c
index 9326c377822e..72c5976a5ce3 100644
--- a/trunk/net/bridge/br_fdb.c
+++ b/trunk/net/bridge/br_fdb.c
@@ -285,7 +285,11 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
 
 			/* convert from internal format to API */
 			memcpy(fe->mac_addr, f->addr.addr, ETH_ALEN);
+
+			/* due to ABI compat need to split into hi/lo */
 			fe->port_no = f->dst->port_no;
+			fe->port_hi = f->dst->port_no >> 8;
+
 			fe->is_local = f->is_local;
 			if (!f->is_static)
 				fe->ageing_timer_value = jiffies_to_clock_t(jiffies - f->ageing_timer);