8 files changed, 27 insertions, 19 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 0a847326a5e4..ecd156def039 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -288,7 +288,8 @@ static int sp_close(struct net_device *dev)
 
 /* Return the frame type ID */
 static int sp_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)
 {
 #ifdef CONFIG_INET
         if (type != htons(ETH_P_AX25))
@@ -323,6 +324,11 @@ static int sp_rebuild_header(struct sk_buff *skb)
 #endif
 }
 
+static const struct header_ops sp_header_ops = {
+        .create         = sp_header,
+        .rebuild        = sp_rebuild_header,
+};
+
 static void sp_setup(struct net_device *dev)
 {
         /* Finish setting up the DEVICE info. */
@@ -331,14 +337,15 @@ static void sp_setup(struct net_device *dev)
         dev->open               = sp_open_dev;
         dev->destructor         = free_netdev;
         dev->stop               = sp_close;
-        dev->hard_header        = sp_header;
+
         dev->get_stats          = sp_get_stats;
         dev->set_mac_address    = sp_set_mac_address;
         dev->hard_header_len    = AX25_MAX_HEADER_LEN;
+        dev->header_ops         = &sp_header_ops;
+
         dev->addr_len           = AX25_ADDR_LEN;
         dev->type               = ARPHRD_AX25;
         dev->tx_queue_len       = 10;
-        dev->rebuild_header     = sp_rebuild_header;
         dev->tx_timeout         = NULL;
 
         /* Only activated in AX.25 mode */
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 355c6cf3d112..1a5a75acf73e 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1159,8 +1159,7 @@ static void baycom_probe(struct net_device *dev)
         /* Fill in the fields of the device structure */
         bc->skb = NULL;
         
-        dev->hard_header = ax25_hard_header;
-        dev->rebuild_header = ax25_rebuild_header;
+        dev->header_ops = &ax25_header_ops;
         dev->set_mac_address = baycom_set_mac_address;
         
         dev->type = ARPHRD_AX25;           /* AF_AX25 device */
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 4bff23e3b970..5ddf8b0c34f9 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -483,8 +483,7 @@ static void bpq_setup(struct net_device *dev)
         dev->flags      = 0;
 
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-        dev->hard_header     = ax25_hard_header;
-        dev->rebuild_header  = ax25_rebuild_header;
+        dev->header_ops      = &ax25_header_ops;
 #endif
 
         dev->type            = ARPHRD_AX25;
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 205f09672492..bc02e4694804 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -581,8 +581,7 @@ static int __init setup_adapter(int card_base, int type, int n)
                 dev->do_ioctl = scc_ioctl;
                 dev->hard_start_xmit = scc_send_packet;
                 dev->get_stats = scc_get_stats;
-                dev->hard_header = ax25_hard_header;
-                dev->rebuild_header = ax25_rebuild_header;
+                dev->header_ops = &ax25_header_ops;
                 dev->set_mac_address = scc_set_mac_address;
         }
         if (register_netdev(info->dev[0])) {
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index b33adc6a340b..ae9629fa6882 100644
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -682,8 +682,7 @@ static void hdlcdrv_setup(struct net_device *dev)
 
         s->skb = NULL;
         
-        dev->hard_header = ax25_hard_header;
-        dev->rebuild_header = ax25_rebuild_header;
+        dev->header_ops = &ax25_header_ops;
         dev->set_mac_address = hdlcdrv_set_mac_address;
         
         dev->type = ARPHRD_AX25;           /* AF_AX25 device */
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index d08fbc396648..9e43c47691ca 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -578,8 +578,9 @@ static int ax_open_dev(struct net_device *dev)
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 
 /* Return the frame type ID */
-static int ax_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-          void *daddr, void *saddr, unsigned len)
+static int ax_header(struct sk_buff *skb, struct net_device *dev,
+                     unsigned short type, const void *daddr,
+                     const void *saddr, unsigned len)
 {
 #ifdef CONFIG_INET
         if (type != htons(ETH_P_AX25))
@@ -670,6 +671,11 @@ static struct net_device_stats *ax_get_stats(struct net_device *dev)
         return &ax->stats;
 }
 
+static const struct header_ops ax_header_ops = {
+        .create    = ax_header,
+        .rebuild   = ax_rebuild_header,
+};
+
 static void ax_setup(struct net_device *dev)
 {
         /* Finish setting up the DEVICE info. */
@@ -683,8 +689,8 @@ static void ax_setup(struct net_device *dev)
         dev->addr_len        = 0;
         dev->type            = ARPHRD_AX25;
         dev->tx_queue_len    = 10;
-        dev->hard_header     = ax_header;
-        dev->rebuild_header  = ax_rebuild_header;
+        dev->header_ops      = &ax_header_ops;
+
 
         memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
         memcpy(dev->dev_addr,  &ax25_defaddr,  AX25_ADDR_LEN);
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 39b3b82aa4a4..353d13e543ce 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1551,8 +1551,8 @@ static void scc_net_setup(struct net_device *dev)
         dev->stop            = scc_net_close;
 
         dev->hard_start_xmit = scc_net_tx;
-        dev->hard_header     = ax25_hard_header;
-        dev->rebuild_header  = ax25_rebuild_header;
+        dev->header_ops      = &ax25_header_ops;
+
         dev->set_mac_address = scc_net_set_mac_address;
         dev->get_stats       = scc_net_get_stats;
         dev->do_ioctl        = scc_net_ioctl;
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 401724ddafcd..1c942862a3f4 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1097,8 +1097,7 @@ static void yam_setup(struct net_device *dev)
 
         skb_queue_head_init(&yp->send_queue);
 
-        dev->hard_header = ax25_hard_header;
-        dev->rebuild_header = ax25_rebuild_header;
+        dev->header_ops = &ax25_header_ops;
 
         dev->set_mac_address = yam_set_mac_address;