ISDN: Add close()/open() callbacks to ISDN net interface implementation

X25 needs notification if an interface is brought up or down, and
ethernet over ISDN creates a fake MAC address at open time, so put this
into appropriate callbacks as well.

drivers/isdn/i4l/isdn_concap.c

@@ -107,12 +107,12 @@ struct concap_proto * isdn_concap_new( int encap )
 	return NULL;
 }
 
-void isdn_x25_open(struct net_device *dev)
+static int
+isdn_x25_open(isdn_net_local *lp)
 {
-	struct concap_proto * cprot =
-		( (isdn_net_local *) dev->priv ) -> netdev -> cprot;
-	struct concap_proto * dops =
-		( (isdn_net_local *) dev->priv ) -> dops;
+	struct net_device * dev = & lp -> netdev -> dev;
+	struct concap_proto * cprot = lp -> netdev -> cprot;
+	struct concap_proto * dops = lp -> dops;
 	unsigned long flags;
 
 	save_flags(flags);
@@ -120,17 +120,19 @@ void isdn_x25_open(struct net_device *dev)
 	if( cprot -> pops && dops )
 		cprot -> pops -> restart ( cprot, dev, dops );
 	restore_flags(flags);
+	return 0;
 }
 
-void isdn_x25_close(struct net_device *dev)
+static void
+isdn_x25_close(isdn_net_local *lp)
 {
-	struct concap_proto * cprot =
-		( (isdn_net_local *) dev->priv ) -> netdev -> cprot;
+	struct concap_proto * cprot = lp -> netdev -> cprot;
 
 	if( cprot && cprot -> pops ) cprot -> pops -> close( cprot );
 }
 
-static void isdn_x25_connected(isdn_net_local *lp)
+static void
+isdn_x25_connected(isdn_net_local *lp)
 {
 	struct concap_proto *cprot = lp -> netdev -> cprot;
 	struct concap_proto_ops *pops = cprot ? cprot -> pops : 0;
@@ -143,7 +145,8 @@ static void isdn_x25_connected(isdn_net_local *lp)
 	isdn_net_device_wake_queue(lp);
 }
 
-static void isdn_x25_disconnected(isdn_net_local *lp)
+static void
+isdn_x25_disconnected(isdn_net_local *lp)
 {
 	struct concap_proto *cprot = lp -> netdev -> cprot;
 	struct concap_proto_ops *pops = cprot ? cprot -> pops : 0;
@@ -155,7 +158,8 @@ static void isdn_x25_disconnected(isdn_net_local *lp)
 		pops -> disconn_ind(cprot);
 }
 
-int isdn_x25_start_xmit(struct sk_buff *skb, struct net_device *dev)
+int
+isdn_x25_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 /* At this point hard_start_xmit() passes control to the encapsulation
    protocol (if present).
@@ -247,6 +251,8 @@ struct isdn_netif_ops isdn_x25_ops = {
 	.disconnected        = isdn_x25_disconnected,
 	.init                = isdn_x25_init,
 	.cleanup             = isdn_x25_cleanup,
+	.open                = isdn_x25_open,
+	.close               = isdn_x25_close,
 };
 
 #endif /* CONFIG_ISDN_X25 */

drivers/isdn/i4l/isdn_concap.h

@@ -16,22 +16,10 @@ struct concap_proto *isdn_concap_new(int);
 
 extern struct isdn_netif_ops isdn_x25_ops;
 
-void isdn_x25_open(struct net_device *dev);
-void isdn_x25_close(struct net_device *dev);
 int  isdn_x25_start_xmit(struct sk_buff *skb, struct net_device *dev);
 
 #else
 
-static inline void
-isdn_x25_open(struct net_device *dev)
-{
-}
-
-static inline void
-isdn_x25_close(struct net_device *dev)
-{
-}
-
 static inline int
 isdn_x25_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {

drivers/isdn/i4l/isdn_net.c

@@ -232,36 +232,19 @@ isdn_net_unreachable(struct net_device *dev, struct sk_buff *skb, char *reason)
 static int
 isdn_net_open(struct net_device *dev)
 {
-	int i;
-	struct net_device *p;
-	struct in_device *in_dev;
+	isdn_net_local *lp = dev->priv;
+	int retval = 0;
 
-	/* moved here from isdn_net_reset, because only the master has an
-	   interface associated which is supposed to be started. BTW:
-	   we need to call netif_start_queue, not netif_wake_queue here */
-	netif_start_queue(dev);
+	if (!lp->ops)
+		return -ENODEV;
 
-	isdn_x25_open(dev);
-	/* Fill in the MAC-level header (not needed, but for compatibility... */
-	for (i = 0; i < ETH_ALEN - sizeof(u32); i++)
-		dev->dev_addr[i] = 0xfc;
-	if ((in_dev = dev->ip_ptr) != NULL) {
-		/*
-		 *      Any address will do - we take the first
-		 */
-		struct in_ifaddr *ifa = in_dev->ifa_list;
-		if (ifa != NULL)
-			memcpy(dev->dev_addr+2, &ifa->ifa_local, 4);
-	}
+	if (lp->ops->open)
+		retval = lp->ops->open(lp);
 
-	/* If this interface has slaves, start them also */
+	if (!retval)
+		return retval;
 	
-	if ((p = (((isdn_net_local *) dev->priv)->slave))) {
-		while (p) {
-			isdn_x25_open(p);
-			p = (((isdn_net_local *) p->priv)->slave);
-		}
-	}
+	netif_start_queue(dev);
 	isdn_MOD_INC_USE_COUNT();
 	return 0;
 }
@@ -1132,17 +1115,16 @@ static int
 isdn_net_close(struct net_device *dev)
 {
 	struct net_device *p;
+	isdn_net_local *lp = dev->priv;
+
+	if (lp->ops->close)
+		lp->ops->close(lp);
 
-	isdn_x25_close(dev);
 	netif_stop_queue(dev);
-	if ((p = (((isdn_net_local *) dev->priv)->slave))) {
-		/* If this interface has slaves, stop them also */
-		while (p) {
-			isdn_x25_close(p);
+	
+	for (p = lp->slave; p; p = ((isdn_net_local *) p->priv)->slave)
 		isdn_net_hangup(p->priv);
-			p = (((isdn_net_local *) p->priv)->slave);
-		}
-	}
+
 	isdn_net_hangup(dev->priv);
 	isdn_MOD_DEC_USE_COUNT();
 	return 0;
@@ -2372,6 +2354,26 @@ isdn_ether_receive(isdn_net_dev *p, isdn_net_local *olp,
 	netif_rx(skb);
 }
 
+static int
+isdn_ether_open(isdn_net_local *lp)
+{
+	struct net_device *dev = &lp->netdev->dev;
+	struct in_device *in_dev;
+	int i;
+
+	/* Fill in the MAC-level header ... */
+	for (i = 0; i < ETH_ALEN; i++)
+		dev->dev_addr[i] = 0xfc;
+	in_dev = dev->ip_ptr;
+	if (in_dev) {
+		/* any address will do - we take the first */
+		struct in_ifaddr *ifa = in_dev->ifa_list;
+		if (ifa)
+			memcpy(dev->dev_addr+2, &ifa->ifa_local, 4);
+	}
+	return 0;
+}
+
 static int
 isdn_ether_init(isdn_net_local *lp)
 {
@@ -2388,6 +2390,7 @@ static struct isdn_netif_ops ether_ops = {
 	.hard_header         = eth_header,
 	.receive             = isdn_ether_receive,
 	.init                = isdn_ether_init,
+	.open                = isdn_ether_open,
 };
 
 // ======================================================================

include/linux/isdn.h

@@ -303,6 +303,8 @@ struct isdn_netif_ops {
 	void                    (*unbind)(struct isdn_net_local_s *lp);
 	int                     (*init)(struct isdn_net_local_s *lp);
 	void                    (*cleanup)(struct isdn_net_local_s *lp);
+	int                     (*open)(struct isdn_net_local_s *lp);
+	void                    (*close)(struct isdn_net_local_s *lp);
 };
 
 /* Local interface-data */