7 files changed, 46 insertions, 33 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index cd03a61359aa..074055e18c5c 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2696,9 +2696,13 @@ static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci)
         return rc;
 }
 
+static const struct header_ops airo_header_ops = {
+        .parse = wll_header_parse,
+};
+
 static void wifi_setup(struct net_device *dev)
 {
-        dev->hard_header_parse  = wll_header_parse;
+        dev->header_ops = &airo_header_ops;
         dev->hard_start_xmit = &airo_start_xmit11;
         dev->get_stats = &airo_get_stats;
         dev->set_mac_address = &airo_set_mac_address;
diff --git a/drivers/net/wireless/hostap/hostap.h b/drivers/net/wireless/hostap/hostap.h
index ef37a75d550b..951df83702f9 100644
--- a/drivers/net/wireless/hostap/hostap.h
+++ b/drivers/net/wireless/hostap/hostap.h
@@ -30,8 +30,7 @@ void hostap_dump_rx_header(const char *name,
                            const struct hfa384x_rx_frame *rx);
 void hostap_dump_tx_header(const char *name,
                            const struct hfa384x_tx_frame *tx);
-int hostap_80211_header_parse(struct sk_buff *skb, unsigned char *haddr);
-int hostap_80211_prism_header_parse(struct sk_buff *skb, unsigned char *haddr);
+extern const struct header_ops hostap_80211_ops;
 int hostap_80211_get_hdrlen(u16 fc);
 struct net_device_stats *hostap_get_stats(struct net_device *dev);
 void hostap_setup_dev(struct net_device *dev, local_info_t *local,
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 7fa7ab0a4b23..b20bb013d57e 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3258,11 +3258,10 @@ while (0)
         INIT_LIST_HEAD(&local->bss_list);
 
         hostap_setup_dev(dev, local, 1);
-        local->saved_eth_header_parse = dev->hard_header_parse;
 
         dev->hard_start_xmit = hostap_master_start_xmit;
         dev->type = ARPHRD_IEEE80211;
-        dev->hard_header_parse = hostap_80211_header_parse;
+        dev->header_ops = &hostap_80211_ops;
 
         rtnl_lock();
         ret = dev_alloc_name(dev, "wifi%d");
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 7036ecff5ec1..40f516d42c5e 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -897,11 +897,8 @@ static void hostap_monitor_set_type(local_info_t *local)
         if (local->monitor_type == PRISM2_MONITOR_PRISM ||
             local->monitor_type == PRISM2_MONITOR_CAPHDR) {
                 dev->type = ARPHRD_IEEE80211_PRISM;
-                dev->hard_header_parse =
-                        hostap_80211_prism_header_parse;
         } else {
                 dev->type = ARPHRD_IEEE80211;
-                dev->hard_header_parse = hostap_80211_header_parse;
         }
 }
 
@@ -1141,7 +1138,7 @@ static int hostap_monitor_mode_disable(local_info_t *local)
 
         printk(KERN_DEBUG "%s: Disabling monitor mode\n", dev->name);
         dev->type = ARPHRD_ETHER;
-        dev->hard_header_parse = local->saved_eth_header_parse;
+
         if (local->func->cmd(dev, HFA384X_CMDCODE_TEST |
                              (HFA384X_TEST_STOP << 8),
                              0, NULL, NULL))
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 4cb09d81b404..b75cf9205ce0 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -594,24 +594,27 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
 }
 
 
-int hostap_80211_header_parse(struct sk_buff *skb, unsigned char *haddr)
+int hostap_80211_header_parse(const struct sk_buff *skb, unsigned char *haddr)
 {
-        memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
-        return ETH_ALEN;
-}
-
+        struct hostap_interface *iface = netdev_priv(skb->dev);
+        local_info_t *local = iface->local;
+
+        if (local->monitor_type == PRISM2_MONITOR_PRISM ||
+            local->monitor_type == PRISM2_MONITOR_CAPHDR) {
+                const unsigned char *mac = skb_mac_header(skb);
+
+                if (*(u32 *)mac == LWNG_CAP_DID_BASE) {
+                        memcpy(haddr,
+                               mac + sizeof(struct linux_wlan_ng_prism_hdr) + 10,
+                               ETH_ALEN); /* addr2 */
+                } else { /* (*(u32 *)mac == htonl(LWNG_CAPHDR_VERSION)) */
+                        memcpy(haddr,
+                               mac + sizeof(struct linux_wlan_ng_cap_hdr) + 10,
+                               ETH_ALEN); /* addr2 */
+                }
+        } else
+                memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
 
-int hostap_80211_prism_header_parse(struct sk_buff *skb, unsigned char *haddr)
-{
-        const unsigned char *mac = skb_mac_header(skb);
-
-        if (*(u32 *)mac == LWNG_CAP_DID_BASE) {
-                memcpy(haddr, mac + sizeof(struct linux_wlan_ng_prism_hdr) + 10,
-                       ETH_ALEN); /* addr2 */
-        } else { /* (*(u32 *)mac == htonl(LWNG_CAPHDR_VERSION)) */
-                memcpy(haddr, mac + sizeof(struct linux_wlan_ng_cap_hdr) + 10,
-                       ETH_ALEN); /* addr2 */
-        }
         return ETH_ALEN;
 }
 
@@ -843,6 +846,15 @@ static void prism2_tx_timeout(struct net_device *dev)
         local->func->schedule_reset(local);
 }
 
+const struct header_ops hostap_80211_ops = {
+        .create         = eth_header,
+        .rebuild        = eth_rebuild_header,
+        .cache          = eth_header_cache,
+        .cache_update   = eth_header_cache_update,
+
+        .parse          = hostap_80211_header_parse,
+};
+EXPORT_SYMBOL(hostap_80211_ops);
 
 void hostap_setup_dev(struct net_device *dev, local_info_t *local,
                       int main_dev)
@@ -883,7 +895,6 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
         netif_stop_queue(dev);
 }
 
-
 static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
 {
         struct net_device *dev = local->dev;
@@ -901,7 +912,7 @@ static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
 
         local->apdev->hard_start_xmit = hostap_mgmt_start_xmit;
         local->apdev->type = ARPHRD_IEEE80211;
-        local->apdev->hard_header_parse = hostap_80211_header_parse;
+        local->apdev->header_ops = &hostap_80211_ops;
 
         return 0;
 }
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index a42325c145b4..c27b2c1c06af 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -736,8 +736,6 @@ struct local_info {
                 PRISM2_MONITOR_80211 = 0, PRISM2_MONITOR_PRISM = 1,
                 PRISM2_MONITOR_CAPHDR = 2
         } monitor_type;
-        int (*saved_eth_header_parse)(struct sk_buff *skb,
-                                      unsigned char *haddr);
         int monitor_allow_fcserr;
 
         int hostapd; /* whether user space daemon, hostapd, is used for AP
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 404cd1512312..4bd14b331862 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1631,8 +1631,8 @@ static void strip_IdleTask(unsigned long parameter)
  */
 
 static int strip_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 strip *strip_info = netdev_priv(dev);
         STRIP_Header *header = (STRIP_Header *) skb_push(skb, sizeof(STRIP_Header));
@@ -2497,6 +2497,11 @@ static int strip_close_low(struct net_device *dev)
         return 0;
 }
 
+static const struct header_ops strip_header_ops = {
+        .create = strip_header,
+        .rebuild = strip_rebuild_header,
+};
+
 /*
  * This routine is called by DDI when the
  * (dynamically assigned) device is registered
@@ -2531,8 +2536,8 @@ static void strip_dev_setup(struct net_device *dev)
         dev->open = strip_open_low;
         dev->stop = strip_close_low;
         dev->hard_start_xmit = strip_xmit;
-        dev->hard_header = strip_header;
-        dev->rebuild_header = strip_rebuild_header;
+        dev->header_ops = &strip_header_ops;
+
         dev->set_mac_address = strip_set_mac_address;
         dev->get_stats = strip_get_stats;
         dev->change_mtu = strip_change_mtu;