From bc673344dd946a5f20c708d20132e06ed861b827 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 23 Nov 2005 12:49:59 +0100
Subject: [PATCH] --- yaml --- r: 15774 b: refs/heads/master c:
 cffbfcaf00c4a36592fabd54ae9f960b552322b6 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/ixp2000/enp2611.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 14a38d4375f1..8156fb6269e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6e429bdd6f0142558896e29c21a526c1ffdd1f3
+refs/heads/master: cffbfcaf00c4a36592fabd54ae9f960b552322b6
diff --git a/trunk/drivers/net/ixp2000/enp2611.c b/trunk/drivers/net/ixp2000/enp2611.c
index 2542e3bacfb9..d82651a97bae 100644
--- a/trunk/drivers/net/ixp2000/enp2611.c
+++ b/trunk/drivers/net/ixp2000/enp2611.c
@@ -175,10 +175,15 @@ static void enp2611_set_port_admin_status(int port, int up)
 {
 	if (up) {
 		caleb_enable_rx(port);
+
+		pm3386_set_carrier(port, 1);
 		pm3386_enable_rx(port);
 	} else {
 		caleb_disable_tx(port);
 		pm3386_disable_tx(port);
+		/* @@@ Flush out pending packets.  */
+		pm3386_set_carrier(port, 0);
+
 		pm3386_disable_rx(port);
 		caleb_disable_rx(port);
 	}