1 files changed, 9 insertions, 7 deletions

diff --git a/net/802/hippi.c b/net/802/hippi.c
index 87ffc12b6891..e35dc1e0915d 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -45,8 +45,8 @@
  */
 
 static int hippi_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 hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN);
         struct hippi_cb *hcb = (struct hippi_cb *) skb->cb;
@@ -182,16 +182,18 @@ static int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
         return 0;
 }
 
+static const struct header_ops hippi_header_ops = {
+        .create         = hippi_header,
+        .rebuild        = hippi_rebuild_header,
+};
+
+
 static void hippi_setup(struct net_device *dev)
 {
         dev->set_multicast_list         = NULL;
         dev->change_mtu                 = hippi_change_mtu;
-        dev->hard_header                = hippi_header;
-        dev->rebuild_header             = hippi_rebuild_header;
+        dev->header_ops                 = &hippi_header_ops;
         dev->set_mac_address            = hippi_mac_addr;
-        dev->hard_header_parse          = NULL;
-        dev->hard_header_cache          = NULL;
-        dev->header_cache_update        = NULL;
         dev->neigh_setup                = hippi_neigh_setup_dev;
 
         /*