[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>

4 files changed, 33 insertions, 19 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;