From 44ee9b36d7d3040b38142f2cfd384a4ddb97e225 Mon Sep 17 00:00:00 2001
From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Mon, 16 Jun 2008 17:17:31 -0700
Subject: [PATCH] --- yaml --- r: 98228 b: refs/heads/master c:
 059e3779b59527150e1d1942026ec149192cbf77 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/drivers/atm/he.c |  3 ++-
 trunk/drivers/atm/he.h | 13 ++++---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 80b8ae5099a7..3bbe98a753c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6c1d704ab5d2e13bebb096e415156a9c54a3d32
+refs/heads/master: 059e3779b59527150e1d1942026ec149192cbf77
diff --git a/trunk/drivers/atm/he.c b/trunk/drivers/atm/he.c
index ffc4a5a41946..320320e3dfb3 100644
--- a/trunk/drivers/atm/he.c
+++ b/trunk/drivers/atm/he.c
@@ -1542,7 +1542,8 @@ he_start(struct atm_dev *dev)
 	/* initialize framer */
 
 #ifdef CONFIG_ATM_HE_USE_SUNI
-	suni_init(he_dev->atm_dev);
+	if (he_isMM(he_dev))
+		suni_init(he_dev->atm_dev);
 	if (he_dev->atm_dev->phy && he_dev->atm_dev->phy->start)
 		he_dev->atm_dev->phy->start(he_dev->atm_dev);
 #endif /* CONFIG_ATM_HE_USE_SUNI */
diff --git a/trunk/drivers/atm/he.h b/trunk/drivers/atm/he.h
index fe6cd15a78a4..b87d6ccabac1 100644
--- a/trunk/drivers/atm/he.h
+++ b/trunk/drivers/atm/he.h
@@ -267,13 +267,7 @@ struct he_dev {
 
 	char prod_id[30];
 	char mac_addr[6];
-	int media;			/*  
-					 *  0x26 = HE155 MM 
-					 *  0x27 = HE622 MM 
-					 *  0x46 = HE155 SM 
-					 *  0x47 = HE622 SM 
-					 */
-
+	int media;
 
 	unsigned int vcibits, vpibits;
 	unsigned int cells_per_row;
@@ -392,6 +386,7 @@ struct he_vcc
 #define HE_DEV(dev) ((struct he_dev *) (dev)->dev_data)
 
 #define he_is622(dev)	((dev)->media & 0x1)
+#define he_isMM(dev)	((dev)->media & 0x20)
 
 #define HE_REGMAP_SIZE	0x100000
 
@@ -876,8 +871,8 @@ struct he_vcc
 #define M_SN		0x3a	/* integer */
 #define MEDIA		0x3e	/* integer */
 #define  HE155MM	0x26
-#define  HE155SM	0x27
-#define  HE622MM	0x46
+#define  HE622MM	0x27
+#define  HE155SM	0x46
 #define  HE622SM	0x47
 #define MAC_ADDR	0x42	/* char[] */