[wan lapb] beginning of cleanups

Beginning of lapb cleanups: lapb_register gets net_device along with the
"token" and it gets stored in lapb_cb (token argument will die later).

drivers/net/wan/comx-proto-lapb.c

@@ -453,7 +453,7 @@ static int comxlapb_init(struct net_device *dev)
 	lapbreg.disconnect_indication = comxlapb_disconnected;
 	lapbreg.data_indication = comxlapb_data_indication;
 	lapbreg.data_transmit = comxlapb_data_transmit;
-	if (lapb_register(dev->priv, &lapbreg)) {
+	if (lapb_register(dev, dev->priv, &lapbreg)) {
 		return -ENOMEM;
 	}
 	if (ch->debug_flags & DEBUG_COMX_LAPB) {

drivers/net/wan/hdlc_x25.c

@@ -154,7 +154,7 @@ static int x25_open(hdlc_device *hdlc)
 	cb.data_indication = x25_data_indication;
 	cb.data_transmit = x25_data_transmit;
 
-	result = lapb_register(hdlc, &cb);
+	result = lapb_register(hdlc_to_dev(hdlc), hdlc, &cb);
 	if (result != LAPB_OK)
 		return result;
 	return 0;

drivers/net/wan/lapbether.c

@@ -307,7 +307,7 @@ static int lapbeth_open(struct net_device *dev)
 	int err;
 
 	lapbeth = (struct lapbethdev *)dev->priv;
-	if ((err = lapb_register(lapbeth, &lapbeth_callbacks)) != LAPB_OK) {
+	if ((err = lapb_register(dev, lapbeth, &lapbeth_callbacks)) != LAPB_OK) {
 		printk(KERN_ERR "lapbeth: lapb_register error - %d\n", err);
 		return -ENODEV;
 	}

drivers/net/wan/x25_asy.c

@@ -500,7 +500,7 @@ static int x25_asy_open(struct net_device *dev)
 	/*
 	 *	Now attach LAPB
 	 */
-	if((err=lapb_register(sl, &x25_asy_callbacks))==LAPB_OK)
+	if((err=lapb_register(dev, sl, &x25_asy_callbacks))==LAPB_OK)
 		return 0;
 
 	/* Cleanup */

include/linux/lapb.h

@@ -44,7 +44,7 @@ struct lapb_parms_struct {
 	unsigned int mode;
 };
 
-extern int lapb_register(void *token, struct lapb_register_struct *callbacks);
+extern int lapb_register(struct net_device *dev, void *token, struct lapb_register_struct *callbacks);
 extern int lapb_unregister(void *token);
 extern int lapb_getparms(void *token, struct lapb_parms_struct *parms);
 extern int lapb_setparms(void *token, struct lapb_parms_struct *parms);

include/net/lapb.h

@@ -80,6 +80,7 @@ struct lapb_frame {
  */
 struct lapb_cb {
 	struct list_head	node;
+	struct net_device	*dev;
 	void			*token;
 
 	/* Link status fields */

net/lapb/lapb_iface.c

@@ -144,7 +144,7 @@ static struct lapb_cb *lapb_create_cb(void)
 	return lapb;
 }
 
-int lapb_register(void *token, struct lapb_register_struct *callbacks)
+int lapb_register(struct net_device *dev, void *token, struct lapb_register_struct *callbacks)
 {
 	struct lapb_cb *lapb;
 	int rc = LAPB_BADTOKEN;
@@ -163,6 +163,7 @@ int lapb_register(void *token, struct lapb_register_struct *callbacks)
 		goto out;
 
 	lapb->token     = token;
+	lapb->dev       = dev;
 	lapb->callbacks = *callbacks;
 
 	__lapb_insert_cb(lapb);