X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fwan%2Fhd6457x.c;fp=drivers%2Fnet%2Fwan%2Fhd6457x.c;h=d3743321a9777ccf7e4d50aa09db9bc2d1d36f00;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=dce2bb317b82bad854f880996c74345d3076a853;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c
index dce2bb317..d3743321a 100644
--- a/drivers/net/wan/hd6457x.c
+++ b/drivers/net/wan/hd6457x.c
@@ -168,23 +168,6 @@ static inline u32 buffer_offset(port_t *port, u16 desc, int transmit)
 }
 
 
-static inline void sca_set_carrier(port_t *port)
-{
-	if (!(sca_in(get_msci(port) + ST3, port_to_card(port)) & ST3_DCD)) {
-#ifdef DEBUG_LINK
-		printk(KERN_DEBUG "%s: sca_set_carrier on\n",
-		       port_to_dev(port)->name);
-#endif
-		netif_carrier_on(port_to_dev(port));
-	} else {
-#ifdef DEBUG_LINK
-		printk(KERN_DEBUG "%s: sca_set_carrier off\n",
-		       port_to_dev(port)->name);
-#endif
-		netif_carrier_off(port_to_dev(port));
-	}
-}
-
 
 static void sca_init_sync_port(port_t *port)
 {
@@ -254,7 +237,9 @@ static void sca_init_sync_port(port_t *port)
 			sca_out(DIR_BOFE, DIR_TX(phy_node(port)), card);
 		}
 	}
-	sca_set_carrier(port);
+
+	hdlc_set_carrier(!(sca_in(get_msci(port) + ST3, card) & ST3_DCD),
+			 port_to_dev(port));
 }
 
 
@@ -277,7 +262,8 @@ static inline void sca_msci_intr(port_t *port)
 	}
 
 	if (stat & ST1_CDCD)
-		sca_set_carrier(port);
+		hdlc_set_carrier(!(sca_in(msci + ST3, card) & ST3_DCD),
+				 port_to_dev(port));
 }
 #endif
 
@@ -580,7 +566,7 @@ static void sca_open(struct net_device *dev)
    - all DMA interrupts
 */
 
-	sca_set_carrier(port);
+	hdlc_set_carrier(!(sca_in(msci + ST3, card) & ST3_DCD), dev);
 
 #ifdef __HD64570_H
 	/* MSCI TX INT and RX INT A IRQ enable */