6 files changed, 23 insertions, 23 deletions

diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 9040d7cf65..65ad2e24ca 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -38,7 +38,7 @@
 #include <linux/hdlc.h>
 
 
-static const char* version = "HDLC support module revision 1.20";
+static const char* version = "HDLC support module revision 1.21";
 
 #undef DEBUG_LINK
 
@@ -222,19 +222,31 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return -EINVAL;
 }
 
+static void hdlc_setup_dev(struct net_device *dev)
+{
+        /* Re-init all variables changed by HDLC protocol drivers,
+         * including ether_setup() called from hdlc_raw_eth.c.
+         */
+        dev->get_stats           = hdlc_get_stats;
+        dev->flags               = IFF_POINTOPOINT | IFF_NOARP;
+        dev->mtu                 = HDLC_MAX_MTU;
+        dev->type                = ARPHRD_RAWHDLC;
+        dev->hard_header_len     = 16;
+        dev->addr_len            = 0;
+        dev->hard_header         = NULL;
+        dev->rebuild_header      = NULL;
+        dev->set_mac_address     = NULL;
+        dev->hard_header_cache   = NULL;
+        dev->header_cache_update = NULL;
+        dev->change_mtu          = hdlc_change_mtu;
+        dev->hard_header_parse   = NULL;
+}
+
 static void hdlc_setup(struct net_device *dev)
 {
         hdlc_device *hdlc = dev_to_hdlc(dev);
 
-        dev->get_stats = hdlc_get_stats;
-        dev->change_mtu = hdlc_change_mtu;
-        dev->mtu = HDLC_MAX_MTU;
-
-        dev->type = ARPHRD_RAWHDLC;
-        dev->hard_header_len = 16;
-
-        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-
+        hdlc_setup_dev(dev);
         hdlc->carrier = 1;
         hdlc->open = 0;
         spin_lock_init(&hdlc->state_lock);
@@ -294,6 +306,7 @@ void detach_hdlc_protocol(struct net_device *dev)
         }
         kfree(hdlc->state);
         hdlc->state = NULL;
+        hdlc_setup_dev(dev);
 }
 
 
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index b0bc5ddcf1..c9664fd8a9 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -365,10 +365,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)
                 memcpy(&state(hdlc)->settings, &new_settings, size);
                 dev->hard_start_xmit = hdlc->xmit;
                 dev->hard_header = cisco_hard_header;
-                dev->hard_header_cache = NULL;
                 dev->type = ARPHRD_CISCO;
-                dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-                dev->addr_len = 0;
                 netif_dormant_on(dev);
                 return 0;
         }
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index b45ab680d2..c6c3c757d6 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1289,10 +1289,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
                 memcpy(&state(hdlc)->settings, &new_settings, size);
 
                 dev->hard_start_xmit = hdlc->xmit;
-                dev->hard_header = NULL;
                 dev->type = ARPHRD_FRAD;
-                dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-                dev->addr_len = 0;
                 return 0;
 
         case IF_PROTO_FR_ADD_PVC:
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index e9f717070f..4591437dd2 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -127,9 +127,7 @@ static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr)
                 if (result)
                         return result;
                 dev->hard_start_xmit = hdlc->xmit;
-                dev->hard_header = NULL;
                 dev->type = ARPHRD_PPP;
-                dev->addr_len = 0;
                 netif_dormant_off(dev);
                 return 0;
         }
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c
index fe3cae5c6b..e23bc66562 100644
--- a/drivers/net/wan/hdlc_raw.c
+++ b/drivers/net/wan/hdlc_raw.c
@@ -88,10 +88,7 @@ static int raw_ioctl(struct net_device *dev, struct ifreq *ifr)
                         return result;
                 memcpy(hdlc->state, &new_settings, size);
                 dev->hard_start_xmit = hdlc->xmit;
-                dev->hard_header = NULL;
                 dev->type = ARPHRD_RAWHDLC;
-                dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-                dev->addr_len = 0;
                 netif_dormant_off(dev);
                 return 0;
         }
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index e4bb9f8ad4..cd7b22f50e 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -215,9 +215,7 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)
                                                    x25_rx, 0)) != 0)
                         return result;
                 dev->hard_start_xmit = x25_xmit;
-                dev->hard_header = NULL;
                 dev->type = ARPHRD_X25;
-                dev->addr_len = 0;
                 netif_dormant_off(dev);
                 return 0;
         }