[NET]: Move hardware header operations out of netdevice.

Since hardware header operations are part of the protocol class
not the device instance, make them into a separate object and
save memory.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

21 files changed, 140 insertions, 94 deletions

diff --git a/net/802/fc.c b/net/802/fc.c
index 675d9ba8e591..cb3475ea6fda 100644
--- a/net/802/fc.c
+++ b/net/802/fc.c
@@ -35,7 +35,7 @@
 
 static int fc_header(struct sk_buff *skb, struct net_device *dev,
                      unsigned short type,
-                     void *daddr, void *saddr, unsigned len)
+                     const void *daddr, const void *saddr, unsigned len)
 {
         struct fch_hdr *fch;
         int hdr_len;
@@ -95,11 +95,14 @@ static int fc_rebuild_header(struct sk_buff *skb)
 #endif
 }
 
+static const struct header_ops fc_header_ops = {
+        .create  = fc_header,
+        .rebuild = fc_rebuild_header,
+};
+
 static void fc_setup(struct net_device *dev)
 {
-        dev->hard_header        = fc_header;
-        dev->rebuild_header     = fc_rebuild_header;
-
+        dev->header_ops         = &fc_header_ops;
         dev->type               = ARPHRD_IEEE802;
         dev->hard_header_len    = FC_HLEN;
         dev->mtu                = 2024;
diff --git a/net/802/fddi.c b/net/802/fddi.c
index 91dde41b5481..0549317b9356 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -52,7 +52,7 @@
 
 static int fddi_header(struct sk_buff *skb, struct net_device *dev,
                        unsigned short type,
-                       void *daddr, void *saddr, unsigned len)
+                       const void *daddr, const void *saddr, unsigned len)
 {
         int hl = FDDI_K_SNAP_HLEN;
         struct fddihdr *fddi;
@@ -175,11 +175,15 @@ static int fddi_change_mtu(struct net_device *dev, int new_mtu)
         return(0);
 }
 
+static const struct header_ops fddi_header_ops = {
+        .create         = fddi_header,
+        .rebuild        = fddi_rebuild_header,
+};
+
 static void fddi_setup(struct net_device *dev)
 {
         dev->change_mtu         = fddi_change_mtu;
-        dev->hard_header        = fddi_header;
-        dev->rebuild_header     = fddi_rebuild_header;
+        dev->header_ops         = &fddi_header_ops;
 
         dev->type               = ARPHRD_FDDI;
         dev->hard_header_len    = FDDI_K_SNAP_HLEN+3;   /* Assume 802.2 SNAP hdr len + 3 pad bytes */
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;
 
         /*
diff --git a/net/802/tr.c b/net/802/tr.c
index aa3c2e936abc..a2bd0f2e3af8 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -100,7 +100,7 @@ static inline unsigned long rif_hash(const unsigned char *addr)
 
 static int tr_header(struct sk_buff *skb, struct net_device *dev,
                      unsigned short type,
-                     void *daddr, void *saddr, unsigned len)
+                     const void *daddr, const void *saddr, unsigned len)
 {
         struct trh_hdr *trh;
         int hdr_len;
@@ -142,7 +142,7 @@ static int tr_header(struct sk_buff *skb, struct net_device *dev,
         if(daddr)
         {
                 memcpy(trh->daddr,daddr,dev->addr_len);
-                tr_source_route(skb,trh,dev);
+                tr_source_route(skb, trh, dev);
                 return(hdr_len);
         }
 
@@ -247,7 +247,8 @@ __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
  *      We try to do source routing...
  */
 
-void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *dev)
+void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,
+                     struct net_device *dev)
 {
         int slack;
         unsigned int hash;
@@ -592,14 +593,18 @@ static const struct file_operations rif_seq_fops = {
 
 #endif
 
+static const struct header_ops tr_header_ops = {
+        .create = tr_header,
+        .rebuild= tr_rebuild_header,
+};
+
 static void tr_setup(struct net_device *dev)
 {
         /*
          *      Configure and register
          */
 
-        dev->hard_header        = tr_header;
-        dev->rebuild_header     = tr_rebuild_header;
+        dev->header_ops = &tr_header_ops;
 
         dev->type               = ARPHRD_IEEE802_TR;
         dev->hard_header_len    = TR_HLEN;
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 4d003e391754..f2bee234d361 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -314,6 +314,12 @@ int unregister_vlan_device(struct net_device *dev)
  */
 static struct lock_class_key vlan_netdev_xmit_lock_key;
 
+static const struct header_ops vlan_header_ops = {
+        .create  = vlan_dev_hard_header,
+        .rebuild = vlan_dev_rebuild_header,
+        .parse   = eth_header_parse,
+};
+
 static int vlan_dev_init(struct net_device *dev)
 {
         struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev;
@@ -331,18 +337,14 @@ static int vlan_dev_init(struct net_device *dev)
                 memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
 
         if (real_dev->features & NETIF_F_HW_VLAN_TX) {
-                dev->hard_header     = real_dev->hard_header;
+                dev->header_ops      = real_dev->header_ops;
                 dev->hard_header_len = real_dev->hard_header_len;
                 dev->hard_start_xmit = vlan_dev_hwaccel_hard_start_xmit;
-                dev->rebuild_header  = real_dev->rebuild_header;
         } else {
-                dev->hard_header     = vlan_dev_hard_header;
+                dev->header_ops      = &vlan_header_ops;
                 dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;
                 dev->hard_start_xmit = vlan_dev_hard_start_xmit;
-                dev->rebuild_header  = vlan_dev_rebuild_header;
         }
-        dev->hard_header_parse = real_dev->hard_header_parse;
-        dev->hard_header_cache = NULL;
 
         lockdep_set_class(&dev->_xmit_lock, &vlan_netdev_xmit_lock_key);
         return 0;
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 7df5b2935579..cf4a80d06b35 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -53,8 +53,8 @@ int vlan_dev_rebuild_header(struct sk_buff *skb);
 int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                   struct packet_type *ptype, struct net_device *orig_dev);
 int vlan_dev_hard_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);
 int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
 int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
 int vlan_dev_change_mtu(struct net_device *dev, int new_mtu);
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index ca8090fdabbb..1a1740aa9a8b 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -343,8 +343,8 @@ static inline unsigned short vlan_dev_get_egress_qos_mask(struct net_device* dev
  *  physical devices.
  */
 int vlan_dev_hard_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 vlan_hdr *vhdr;
         unsigned short veth_TCI = 0;
diff --git a/net/appletalk/dev.c b/net/appletalk/dev.c
index 9e4dffc1e423..d856a62ab50f 100644
--- a/net/appletalk/dev.c
+++ b/net/appletalk/dev.c
@@ -24,11 +24,7 @@ static void ltalk_setup(struct net_device *dev)
         /* Fill in the fields of the device structure with localtalk-generic values. */
 
         dev->change_mtu         = ltalk_change_mtu;
-        dev->hard_header        = NULL;
-        dev->rebuild_header     = NULL;
         dev->set_mac_address    = ltalk_mac_addr;
-        dev->hard_header_cache  = NULL;
-        dev->header_cache_update= NULL;
 
         dev->type               = ARPHRD_LOCALTLK;
         dev->hard_header_len    = LTALK_HLEN;
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index 930e4918037f..f047a57aa95c 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -46,7 +46,9 @@
 
 #ifdef CONFIG_INET
 
-int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
+int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
+                     unsigned short type, const void *daddr,
+                     const void *saddr, unsigned len)
 {
         unsigned char *buff;
 
@@ -215,7 +217,9 @@ put:
 
 #else   /* INET */
 
-int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
+int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
+                     unsigned short type, const void *daddr,
+                     const void *saddr, unsigned len)
 {
         return -AX25_HEADER_LEN;
 }
@@ -227,5 +231,12 @@ int ax25_rebuild_header(struct sk_buff *skb)
 
 #endif
 
+const struct header_ops ax25_header_ops = {
+        .create = ax25_hard_header,
+        .rebuild = ax25_rebuild_header,
+};
+
 EXPORT_SYMBOL(ax25_hard_header);
 EXPORT_SYMBOL(ax25_rebuild_header);
+EXPORT_SYMBOL(ax25_header_ops);
+
diff --git a/net/core/dev.c b/net/core/dev.c
index 3923d5133050..d99864662582 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -967,14 +967,6 @@ void dev_load(struct net *net, const char *name)
                 request_module("%s", name);
 }
 
-static int default_rebuild_header(struct sk_buff *skb)
-{
-        printk(KERN_DEBUG "%s: default_rebuild_header called -- BUG!\n",
-               skb->dev ? skb->dev->name : "NULL!!!");
-        kfree_skb(skb);
-        return 1;
-}
-
 /**
  *      dev_open        - prepare an interface for use.
  *      @dev:   device to open
@@ -3561,14 +3553,6 @@ int register_netdevice(struct net_device *dev)
                 }
         }
 
-        /*
-         *      nil rebuild_header routine,
-         *      that should be never called and used as just bug trap.
-         */
-
-        if (!dev->rebuild_header)
-                dev->rebuild_header = default_rebuild_header;
-
         ret = netdev_register_kobject(dev);
         if (ret)
                 goto err_uninit;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 10bcb9f8da5c..c52df858d0be 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -897,8 +897,8 @@ out_unlock_bh:
 static void neigh_update_hhs(struct neighbour *neigh)
 {
         struct hh_cache *hh;
-        void (*update)(struct hh_cache*, struct net_device*, unsigned char *) =
-                neigh->dev->header_cache_update;
+        void (*update)(struct hh_cache*, const struct net_device*, const unsigned char *)
+                = neigh->dev->header_ops->cache_update;
 
         if (update) {
                 for (hh = neigh->hh; hh; hh = hh->hh_next) {
@@ -1095,7 +1095,8 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst,
                 hh->hh_type = protocol;
                 atomic_set(&hh->hh_refcnt, 0);
                 hh->hh_next = NULL;
-                if (dev->hard_header_cache(n, hh)) {
+
+                if (dev->header_ops->cache(n, hh)) {
                         kfree(hh);
                         hh = NULL;
                 } else {
@@ -1127,7 +1128,7 @@ int neigh_compat_output(struct sk_buff *skb)
 
         if (dev_hard_header(skb, dev, ntohs(skb->protocol), NULL, NULL,
                             skb->len) < 0 &&
-            dev->rebuild_header(skb))
+            dev->header_ops->rebuild(skb))
                 return 0;
 
         return dev_queue_xmit(skb);
@@ -1149,7 +1150,7 @@ int neigh_resolve_output(struct sk_buff *skb)
         if (!neigh_event_send(neigh, skb)) {
                 int err;
                 struct net_device *dev = neigh->dev;
-                if (dev->hard_header_cache && !dst->hh) {
+                if (dev->header_ops->cache && !dst->hh) {
                         write_lock_bh(&neigh->lock);
                         if (!dst->hh)
                                 neigh_hh_init(neigh, dst, dst->ops->protocol);
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index bdeb2f0ace32..ed8a3d49487d 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -75,8 +75,9 @@ __setup("ether=", netdev_boot_setup);
  * Set the protocol type. For a packet of type ETH_P_802_3 we put the length
  * in here instead. It is up to the 802.2 layer to carry protocol information.
  */
-int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-               void *daddr, void *saddr, unsigned len)
+int eth_header(struct sk_buff *skb, struct net_device *dev,
+               unsigned short type,
+               const void *daddr, const void *saddr, unsigned len)
 {
         struct ethhdr *eth = (struct ethhdr *)skb_push(skb, ETH_HLEN);
 
@@ -109,6 +110,7 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
 
         return -ETH_HLEN;
 }
+EXPORT_SYMBOL(eth_header);
 
 /**
  * eth_rebuild_header- rebuild the Ethernet MAC header.
@@ -141,6 +143,7 @@ int eth_rebuild_header(struct sk_buff *skb)
 
         return 0;
 }
+EXPORT_SYMBOL(eth_rebuild_header);
 
 /**
  * eth_type_trans - determine the packet's protocol ID.
@@ -207,12 +210,13 @@ EXPORT_SYMBOL(eth_type_trans);
  * @skb: packet to extract header from
  * @haddr: destination buffer
  */
-static int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr)
+int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr)
 {
         const struct ethhdr *eth = eth_hdr(skb);
         memcpy(haddr, eth->h_source, ETH_ALEN);
         return ETH_ALEN;
 }
+EXPORT_SYMBOL(eth_header_parse);
 
 /**
  * eth_header_cache - fill cache entry from neighbour
@@ -220,11 +224,11 @@ static int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr)
  * @hh: destination cache entry
  * Create an Ethernet header template from the neighbour.
  */
-int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh)
+int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh)
 {
         __be16 type = hh->hh_type;
         struct ethhdr *eth;
-        struct net_device *dev = neigh->dev;
+        const struct net_device *dev = neigh->dev;
 
         eth = (struct ethhdr *)
             (((u8 *) hh->hh_data) + (HH_DATA_OFF(sizeof(*eth))));
@@ -238,6 +242,7 @@ int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh)
         hh->hh_len = ETH_HLEN;
         return 0;
 }
+EXPORT_SYMBOL(eth_header_cache);
 
 /**
  * eth_header_cache_update - update cache entry
@@ -247,12 +252,14 @@ int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh)
  *
  * Called by Address Resolution module to notify changes in address.
  */
-void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev,
-                             unsigned char *haddr)
+void eth_header_cache_update(struct hh_cache *hh,
+                             const struct net_device *dev,
+                             const unsigned char *haddr)
 {
         memcpy(((u8 *) hh->hh_data) + HH_DATA_OFF(sizeof(struct ethhdr)),
                haddr, ETH_ALEN);
 }
+EXPORT_SYMBOL(eth_header_cache_update);
 
 /**
  * eth_mac_addr - set new Ethernet hardware address
@@ -291,6 +298,14 @@ static int eth_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+const struct header_ops eth_header_ops ____cacheline_aligned = {
+        .create         = eth_header,
+        .parse          = eth_header_parse,
+        .rebuild        = eth_rebuild_header,
+        .cache          = eth_header_cache,
+        .cache_update   = eth_header_cache_update,
+};
+
 /**
  * ether_setup - setup Ethernet network device
  * @dev: network device
@@ -298,13 +313,10 @@ static int eth_change_mtu(struct net_device *dev, int new_mtu)
  */
 void ether_setup(struct net_device *dev)
 {
+        dev->header_ops         = &eth_header_ops;
+
         dev->change_mtu         = eth_change_mtu;
-        dev->hard_header        = eth_header;
-        dev->rebuild_header     = eth_rebuild_header;
         dev->set_mac_address    = eth_mac_addr;
-        dev->hard_header_cache  = eth_header_cache;
-        dev->header_cache_update= eth_header_cache_update;
-        dev->hard_header_parse  = eth_header_parse;
 
         dev->type               = ARPHRD_ETHER;
         dev->hard_header_len    = ETH_HLEN;
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 5b24c65b13c6..d8248198bcd7 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -253,7 +253,7 @@ static int arp_constructor(struct neighbour *neigh)
         neigh->parms = neigh_parms_clone(parms);
         rcu_read_unlock();
 
-        if (dev->hard_header == NULL) {
+        if (!dev->header_ops) {
                 neigh->nud_state = NUD_NOARP;
                 neigh->ops = &arp_direct_ops;
                 neigh->output = neigh->ops->queue_xmit;
@@ -310,10 +310,12 @@ static int arp_constructor(struct neighbour *neigh)
                         neigh->nud_state = NUD_NOARP;
                         memcpy(neigh->ha, dev->broadcast, dev->addr_len);
                 }
-                if (dev->hard_header_cache)
+
+                if (dev->header_ops->cache)
                         neigh->ops = &arp_hh_ops;
                 else
                         neigh->ops = &arp_generic_ops;
+
                 if (neigh->nud_state&NUD_VALID)
                         neigh->output = neigh->ops->connected_output;
                 else
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index ffa9f1c9dcbb..f151900efaf9 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -684,7 +684,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto tx_error;
         }
 
-        if (dev->hard_header) {
+        if (dev->header_ops) {
                 gre_hlen = 0;
                 tiph = (struct iphdr*)skb->data;
         } else {
@@ -1063,8 +1063,9 @@ static int ipgre_tunnel_change_mtu(struct net_device *dev, int new_mtu)
 
  */
 
-static int ipgre_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-                        void *daddr, void *saddr, unsigned len)
+static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
+                        unsigned short type,
+                        const void *daddr, const void *saddr, unsigned len)
 {
         struct ip_tunnel *t = netdev_priv(dev);
         struct iphdr *iph = (struct iphdr *)skb_push(skb, t->hlen);
@@ -1091,6 +1092,10 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, unsigned sh
         return -t->hlen;
 }
 
+static const struct header_ops ipgre_header_ops = {
+        .create = ipgre_header,
+};
+
 static int ipgre_open(struct net_device *dev)
 {
         struct ip_tunnel *t = netdev_priv(dev);
@@ -1187,7 +1192,7 @@ static int ipgre_tunnel_init(struct net_device *dev)
                         if (!iph->saddr)
                                 return -EINVAL;
                         dev->flags = IFF_BROADCAST;
-                        dev->hard_header = ipgre_header;
+                        dev->header_ops = &ipgre_header_ops;
                         dev->open = ipgre_open;
                         dev->stop = ipgre_close;
                 }
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 77f67b7cb9bf..699f06781fd8 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -169,7 +169,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
                 IP_INC_STATS(IPSTATS_MIB_OUTBCASTPKTS);
 
         /* Be paranoid, rather than too clever. */
-        if (unlikely(skb_headroom(skb) < hh_len && dev->hard_header)) {
+        if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {
                 struct sk_buff *skb2;
 
                 skb2 = skb_realloc_headroom(skb, LL_RESERVED_SPACE(dev));
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 7ea5a502ca08..b761dbed8cec 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -354,7 +354,7 @@ static int ndisc_constructor(struct neighbour *neigh)
         rcu_read_unlock();
 
         neigh->type = is_multicast ? RTN_MULTICAST : RTN_UNICAST;
-        if (dev->hard_header == NULL) {
+        if (!dev->header_ops) {
                 neigh->nud_state = NUD_NOARP;
                 neigh->ops = &ndisc_direct_ops;
                 neigh->output = neigh->ops->queue_xmit;
@@ -371,7 +371,7 @@ static int ndisc_constructor(struct neighbour *neigh)
                         neigh->nud_state = NUD_NOARP;
                         memcpy(neigh->ha, dev->broadcast, dev->addr_len);
                 }
-                if (dev->hard_header_cache)
+                if (dev->header_ops->cache)
                         neigh->ops = &ndisc_hh_ops;
                 else
                         neigh->ops = &ndisc_generic_ops;
@@ -807,7 +807,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
                 neigh_update(neigh, lladdr, NUD_STALE,
                              NEIGH_UPDATE_F_WEAK_OVERRIDE|
                              NEIGH_UPDATE_F_OVERRIDE);
-        if (neigh || !dev->hard_header) {
+        if (neigh || !dev->header_ops) {
                 ndisc_send_na(dev, neigh, saddr, &msg->target,
                               is_router,
                               1, (ifp != NULL && inc), inc);
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 0cdcf0d0c6ca..57ec8880bb1a 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -228,7 +228,6 @@ void ieee80211_if_mgmt_setup(struct net_device *dev)
         dev->open = ieee80211_mgmt_open;
         dev->stop = ieee80211_mgmt_stop;
         dev->type = ARPHRD_IEEE80211_PRISM;
-        dev->hard_header_parse = header_parse_80211;
         dev->uninit = ieee80211_if_reinit;
         dev->destructor = ieee80211_if_free;
 }
@@ -546,10 +545,19 @@ static void ieee80211_set_multicast_list(struct net_device *dev)
         netif_tx_unlock(local->mdev);
 }
 
+static const struct header_ops ieee80211_header_ops = {
+        .create         = eth_header,
+        .parse          = header_parse_80211,
+        .rebuild        = eth_rebuild_header,
+        .cache          = eth_header_cache,
+        .cache_update   = eth_header_cache_update,
+};
+
 /* Must not be called for mdev and apdev */
 void ieee80211_if_setup(struct net_device *dev)
 {
         ether_setup(dev);
+        dev->header_ops = &ieee80211_header_ops;
         dev->hard_start_xmit = ieee80211_subif_start_xmit;
         dev->wireless_handlers = &ieee80211_iw_handler_def;
         dev->set_multicast_list = ieee80211_set_multicast_list;
@@ -1197,7 +1205,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         mdev->open = ieee80211_master_open;
         mdev->stop = ieee80211_master_stop;
         mdev->type = ARPHRD_IEEE80211;
-        mdev->hard_header_parse = header_parse_80211;
+        mdev->header_ops = &ieee80211_header_ops;
 
         sdata->type = IEEE80211_IF_TYPE_AP;
         sdata->dev = mdev;
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index c7b5d930e732..8c68da5ef0a1 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -95,8 +95,9 @@ static int nr_rebuild_header(struct sk_buff *skb)
 
 #endif
 
-static int nr_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-        void *daddr, void *saddr, unsigned len)
+static int nr_header(struct sk_buff *skb, struct net_device *dev,
+                     unsigned short type,
+                     const void *daddr, const void *saddr, unsigned len)
 {
         unsigned char *buff = skb_push(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN);
 
@@ -193,6 +194,12 @@ static struct net_device_stats *nr_get_stats(struct net_device *dev)
         return &nr->stats;
 }
 
+static const struct header_ops nr_header_ops = {
+        .create = nr_header,
+        .rebuild= nr_rebuild_header,
+};
+
+
 void nr_setup(struct net_device *dev)
 {
         dev->mtu                = NR_MAX_PACKET_SIZE;
@@ -200,11 +207,10 @@ void nr_setup(struct net_device *dev)
         dev->open               = nr_open;
         dev->stop               = nr_close;
 
-        dev->hard_header        = nr_header;
+        dev->header_ops         = &nr_header_ops;
         dev->hard_header_len    = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
         dev->addr_len           = AX25_ADDR_LEN;
         dev->type               = ARPHRD_NETROM;
-        dev->rebuild_header     = nr_rebuild_header;
         dev->set_mac_address    = nr_set_mac_address;
 
         /* New-style flags. */
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index c9ee343c2a6c..e11000a8e950 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -389,7 +389,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
         skb_reset_network_header(skb);
 
         /* Try to align data part correctly */
-        if (dev->hard_header) {
+        if (dev->header_ops) {
                 skb->data -= dev->hard_header_len;
                 skb->tail -= dev->hard_header_len;
                 if (len < dev->hard_header_len)
@@ -466,7 +466,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 
         skb->dev = dev;
 
-        if (dev->hard_header) {
+        if (dev->header_ops) {
                 /* The device has an explicit notion of ll header,
                    exported to higher levels.
 
@@ -581,7 +581,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
         sk = pt->af_packet_priv;
         po = pkt_sk(sk);
 
-        if (dev->hard_header) {
+        if (dev->header_ops) {
                 if (sk->sk_type != SOCK_DGRAM)
                         skb_push(skb, skb->data - skb_mac_header(skb));
                 else if (skb->pkt_type == PACKET_OUTGOING) {
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 8d88795dc663..1b6741f1d746 100644
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -35,8 +35,9 @@
 #include <net/ax25.h>
 #include <net/rose.h>
 
-static int rose_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-        void *daddr, void *saddr, unsigned len)
+static int rose_header(struct sk_buff *skb, struct net_device *dev,
+                       unsigned short type,
+                       const void *daddr, const void *saddr, unsigned len)
 {
         unsigned char *buff = skb_push(skb, ROSE_MIN_LEN + 2);
 
@@ -148,6 +149,11 @@ static struct net_device_stats *rose_get_stats(struct net_device *dev)
         return netdev_priv(dev);
 }
 
+static const struct header_ops rose_header_ops = {
+        .create = rose_header,
+        .rebuild= rose_rebuild_header,
+};
+
 void rose_setup(struct net_device *dev)
 {
         dev->mtu                = ROSE_MAX_PACKET_SIZE - 2;
@@ -155,11 +161,10 @@ void rose_setup(struct net_device *dev)
         dev->open               = rose_open;
         dev->stop               = rose_close;
 
-        dev->hard_header        = rose_header;
+        dev->header_ops         = &rose_header_ops;
         dev->hard_header_len    = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN;
         dev->addr_len           = ROSE_ADDR_LEN;
         dev->type               = ARPHRD_ROSE;
-        dev->rebuild_header     = rose_rebuild_header;
         dev->set_mac_address    = rose_set_mac_address;
 
         /* New-style flags. */
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index d13970f3c7b1..be57cf317a7f 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -249,10 +249,10 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *
         return (skb_res == NULL) ? -EAGAIN : 1;
 }
 
-static __inline__ int
-teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *dev)
+static inline int teql_resolve(struct sk_buff *skb,
+                               struct sk_buff *skb_res, struct net_device *dev)
 {
-        if (dev->hard_header == NULL ||
+        if (dev->header_ops == NULL ||
             skb->dst == NULL ||
             skb->dst->neighbour == NULL)
                 return 0;