Commit 059e3779 authored by Chas Williams's avatar Chas Williams Committed by David S. Miller

atm: [he] only support suni driver on multimode interfaces

Signed-off-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6c1d704
...@@ -1542,7 +1542,8 @@ he_start(struct atm_dev *dev) ...@@ -1542,7 +1542,8 @@ he_start(struct atm_dev *dev)
/* initialize framer */ /* initialize framer */
#ifdef CONFIG_ATM_HE_USE_SUNI #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) if (he_dev->atm_dev->phy && he_dev->atm_dev->phy->start)
he_dev->atm_dev->phy->start(he_dev->atm_dev); he_dev->atm_dev->phy->start(he_dev->atm_dev);
#endif /* CONFIG_ATM_HE_USE_SUNI */ #endif /* CONFIG_ATM_HE_USE_SUNI */
......
...@@ -267,13 +267,7 @@ struct he_dev { ...@@ -267,13 +267,7 @@ struct he_dev {
char prod_id[30]; char prod_id[30];
char mac_addr[6]; char mac_addr[6];
int media; /* int media;
* 0x26 = HE155 MM
* 0x27 = HE622 MM
* 0x46 = HE155 SM
* 0x47 = HE622 SM
*/
unsigned int vcibits, vpibits; unsigned int vcibits, vpibits;
unsigned int cells_per_row; unsigned int cells_per_row;
...@@ -392,6 +386,7 @@ struct he_vcc ...@@ -392,6 +386,7 @@ struct he_vcc
#define HE_DEV(dev) ((struct he_dev *) (dev)->dev_data) #define HE_DEV(dev) ((struct he_dev *) (dev)->dev_data)
#define he_is622(dev) ((dev)->media & 0x1) #define he_is622(dev) ((dev)->media & 0x1)
#define he_isMM(dev) ((dev)->media & 0x20)
#define HE_REGMAP_SIZE 0x100000 #define HE_REGMAP_SIZE 0x100000
...@@ -876,8 +871,8 @@ struct he_vcc ...@@ -876,8 +871,8 @@ struct he_vcc
#define M_SN 0x3a /* integer */ #define M_SN 0x3a /* integer */
#define MEDIA 0x3e /* integer */ #define MEDIA 0x3e /* integer */
#define HE155MM 0x26 #define HE155MM 0x26
#define HE155SM 0x27 #define HE622MM 0x27
#define HE622MM 0x46 #define HE155SM 0x46
#define HE622SM 0x47 #define HE622SM 0x47
#define MAC_ADDR 0x42 /* char[] */ #define MAC_ADDR 0x42 /* char[] */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment