7 files changed, 48 insertions, 36 deletions

diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 46e053106d4d..8a1778cf98d1 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -131,14 +131,15 @@ static int cycx_wan_update(struct wan_device *wandev),
            cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev);
 
 /* Network device interface */
-static int cycx_netdevice_init(struct net_device *dev),
-           cycx_netdevice_open(struct net_device *dev),
-           cycx_netdevice_stop(struct net_device *dev),
-           cycx_netdevice_hard_header(struct sk_buff *skb,
-                                     struct net_device *dev, u16 type,
-                                     void *daddr, void *saddr, unsigned len),
-           cycx_netdevice_rebuild_header(struct sk_buff *skb),
-           cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
+static int cycx_netdevice_init(struct net_device *dev);
+static int cycx_netdevice_open(struct net_device *dev);
+static int cycx_netdevice_stop(struct net_device *dev);
+static int cycx_netdevice_hard_header(struct sk_buff *skb,
+                                      struct net_device *dev, u16 type,
+                                      const void *daddr, const void *saddr,
+                                      unsigned len);
+static int cycx_netdevice_rebuild_header(struct sk_buff *skb);
+static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
                                           struct net_device *dev);
 
 static struct net_device_stats *
@@ -468,7 +469,14 @@ static int cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev)
         return 0;
 }
 
+
 /* Network Device Interface */
+
+static const struct header_ops cycx_header_ops = {
+        .create = cycx_netdevice_hard_header,
+        .rebuild = cycx_netdevice_rebuild_header,
+};
+
 /* Initialize Linux network interface.
  *
  * This routine is called only once for each interface, during Linux network
@@ -483,8 +491,8 @@ static int cycx_netdevice_init(struct net_device *dev)
         /* Initialize device driver entry points */
         dev->open               = cycx_netdevice_open;
         dev->stop               = cycx_netdevice_stop;
-        dev->hard_header        = cycx_netdevice_hard_header;
-        dev->rebuild_header     = cycx_netdevice_rebuild_header;
+        dev->header_ops         = &cycx_header_ops;
+
         dev->hard_start_xmit    = cycx_netdevice_hard_start_xmit;
         dev->get_stats          = cycx_netdevice_get_stats;
 
@@ -554,7 +562,8 @@ static int cycx_netdevice_stop(struct net_device *dev)
  * Return:      media header length. */
 static int cycx_netdevice_hard_header(struct sk_buff *skb,
                                       struct net_device *dev, u16 type,
-                                      void *daddr, void *saddr, unsigned len)
+                                      const void *daddr, const void *saddr,
+                                      unsigned len)
 {
         skb->protocol = type;
 
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index bc12810157e0..96b232446c0b 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -66,8 +66,8 @@ static void dlci_setup(struct net_device *);
  */
 
 static int dlci_header(struct sk_buff *skb, struct net_device *dev, 
-                           unsigned short type, void *daddr, void *saddr, 
-                           unsigned len)
+                       unsigned short type, const void *daddr,
+                       const void *saddr, unsigned len)
 {
         struct frhdr            hdr;
         struct dlci_local       *dlp;
@@ -485,6 +485,10 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
         return(err);
 }
 
+static const struct header_ops dlci_header_ops = {
+        .create = dlci_header,
+};
+
 static void dlci_setup(struct net_device *dev)
 {
         struct dlci_local *dlp = dev->priv;
@@ -494,7 +498,7 @@ static void dlci_setup(struct net_device *dev)
         dev->stop               = dlci_close;
         dev->do_ioctl           = dlci_dev_ioctl;
         dev->hard_start_xmit    = dlci_transmit;
-        dev->hard_header        = dlci_header;
+        dev->header_ops         = &dlci_header_ops;
         dev->get_stats          = dlci_get_stats;
         dev->change_mtu         = dlci_change_mtu;
         dev->destructor         = free_netdev;
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index ee23b91f23d9..d553e6f32851 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -232,6 +232,8 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return -EINVAL;
 }
 
+static const struct header_ops hdlc_null_ops;
+
 static void hdlc_setup_dev(struct net_device *dev)
 {
         /* Re-init all variables changed by HDLC protocol drivers,
@@ -243,13 +245,9 @@ static void hdlc_setup_dev(struct net_device *dev)
         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->header_ops          = &hdlc_null_ops;
+
         dev->change_mtu          = hdlc_change_mtu;
-        dev->hard_header_parse   = NULL;
 }
 
 static void hdlc_setup(struct net_device *dev)
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index 9ec6cf2e510e..038a6e748bbf 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -74,7 +74,7 @@ static inline struct cisco_state * state(hdlc_device *hdlc)
 
 
 static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev,
-                             u16 type, void *daddr, void *saddr,
+                             u16 type, const void *daddr, const void *saddr,
                              unsigned int len)
 {
         struct hdlc_header *data;
@@ -309,7 +309,6 @@ static void cisco_stop(struct net_device *dev)
 }
 
 
-
 static struct hdlc_proto proto = {
         .start          = cisco_start,
         .stop           = cisco_stop,
@@ -317,7 +316,10 @@ static struct hdlc_proto proto = {
         .ioctl          = cisco_ioctl,
         .module         = THIS_MODULE,
 };
- 
+
+static const struct header_ops cisco_header_ops = {
+        .create = cisco_hard_header,
+};
  
 static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)
 {
@@ -365,7 +367,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->header_ops = &cisco_header_ops;
                 dev->type = ARPHRD_CISCO;
                 netif_dormant_on(dev);
                 return 0;
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 4591437dd2f3..3caeb528eace 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -73,7 +73,7 @@ static void ppp_close(struct net_device *dev)
 
         sppp_close(dev);
         sppp_detach(dev);
-        dev->rebuild_header = NULL;
+
         dev->change_mtu = state(hdlc)->old_change_mtu;
         dev->mtu = HDLC_MAX_MTU;
         dev->hard_header_len = 16;
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index 31e1799571ad..426c0678d983 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -111,7 +111,7 @@ void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/
              * They set a few basics because they don't use sync_ppp
              */
             dev->flags |= IFF_POINTOPOINT;
-            dev->hard_header = NULL;
+
             dev->hard_header_len = 0;
             dev->addr_len = 0;
         }
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 5c71af6ea3a5..232ecba5340f 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -359,8 +359,10 @@ done:
  *      Handle transmit packets.
  */
  
-static int sppp_hard_header(struct sk_buff *skb, struct net_device *dev, __u16 type,
-                void *daddr, void *saddr, unsigned int len)
+static int sppp_hard_header(struct sk_buff *skb,
+                            struct net_device *dev, __u16 type,
+                            const void *daddr, const void *saddr,
+                            unsigned int len)
 {
         struct sppp *sp = (struct sppp *)sppp_of(dev);
         struct ppp_header *h;
@@ -392,10 +394,9 @@ static int sppp_hard_header(struct sk_buff *skb, struct net_device *dev, __u16 t
         return sizeof(struct ppp_header);
 }
 
-static int sppp_rebuild_header(struct sk_buff *skb)
-{
-        return 0;
-}
+static const struct header_ops sppp_header_ops = {
+        .create = sppp_hard_header,
+};
 
 /*
  * Send keepalive packets, every 10 seconds.
@@ -1098,8 +1099,8 @@ void sppp_attach(struct ppp_device *pd)
          *      hard_start_xmit.
          */
          
-        dev->hard_header = sppp_hard_header;
-        dev->rebuild_header = sppp_rebuild_header;
+        dev->header_ops = &sppp_header_ops;
+
         dev->tx_queue_len = 10;
         dev->type = ARPHRD_HDLC;
         dev->addr_len = 0;
@@ -1115,8 +1116,6 @@ void sppp_attach(struct ppp_device *pd)
         dev->stop = sppp_close;
 #endif  
         dev->change_mtu = sppp_change_mtu;
-        dev->hard_header_cache = NULL;
-        dev->header_cache_update = NULL;
         dev->flags = IFF_MULTICAST|IFF_POINTOPOINT|IFF_NOARP;
 }