7 files changed, 20 insertions, 29 deletions

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 2aaf6faf74ac..bdeb2f0ace32 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -207,9 +207,9 @@ EXPORT_SYMBOL(eth_type_trans);
  * @skb: packet to extract header from
  * @haddr: destination buffer
  */
-static int eth_header_parse(struct sk_buff *skb, unsigned char *haddr)
+static int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr)
 {
-        struct ethhdr *eth = eth_hdr(skb);
+        const struct ethhdr *eth = eth_hdr(skb);
         memcpy(haddr, eth->h_source, ETH_ALEN);
         return ETH_ALEN;
 }
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 82fda92e6b97..aaa3f5c56761 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -250,10 +250,8 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
 
         if (entry->info->indev && entry->skb->dev) {
                 pmsg->hw_type = entry->skb->dev->type;
-                if (entry->skb->dev->hard_header_parse)
-                        pmsg->hw_addrlen =
-                                entry->skb->dev->hard_header_parse(entry->skb,
-                                                                   pmsg->hw_addr);
+                pmsg->hw_addrlen = dev_parse_header(entry->skb,
+                                                    pmsg->hw_addr);
         }
 
         if (data_len)
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 2f5a52453834..c75f467a8f51 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -248,10 +248,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
 
         if (entry->info->indev && entry->skb->dev) {
                 pmsg->hw_type = entry->skb->dev->type;
-                if (entry->skb->dev->hard_header_parse)
-                        pmsg->hw_addrlen =
-                                entry->skb->dev->hard_header_parse(entry->skb,
-                                                                   pmsg->hw_addr);
+                pmsg->hw_addrlen = dev_parse_header(entry->skb, pmsg->hw_addr);
         }
 
         if (data_len)
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 89be6629cfc0..0cdcf0d0c6ca 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -47,7 +47,7 @@ struct ieee80211_tx_status_rtap_hdr {
 
 /* common interface routines */
 
-static int header_parse_80211(struct sk_buff *skb, unsigned char *haddr)
+static int header_parse_80211(const struct sk_buff *skb, unsigned char *haddr)
 {
         memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */
         return ETH_ALEN;
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 8e4001b8f764..332e0f7f6f9e 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -481,12 +481,13 @@ __build_packet_message(struct nfulnl_instance *inst,
                 NFA_PUT(inst->skb, NFULA_MARK, sizeof(tmp_uint), &tmp_uint);
         }
 
-        if (indev && skb->dev && skb->dev->hard_header_parse) {
+        if (indev && skb->dev) {
                 struct nfulnl_msg_packet_hw phw;
-                int len = skb->dev->hard_header_parse((struct sk_buff *)skb,
-                                                    phw.hw_addr);
-                phw.hw_addrlen = htons(len);
-                NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw);
+                int len = dev_parse_header(skb, phw.hw_addr);
+                if (len > 0) {
+                        phw.hw_addrlen = htons(len);
+                        NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw);
+                }
         }
 
         if (skb->tstamp.tv64) {
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index c97369f48db7..a813185c766d 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -485,14 +485,13 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
                 NFA_PUT(skb, NFQA_MARK, sizeof(u_int32_t), &tmp_uint);
         }
 
-        if (indev && entskb->dev
-            && entskb->dev->hard_header_parse) {
+        if (indev && entskb->dev) {
                 struct nfqnl_msg_packet_hw phw;
-
-                int len = entskb->dev->hard_header_parse(entskb,
-                                                           phw.hw_addr);
-                phw.hw_addrlen = htons(len);
-                NFA_PUT(skb, NFQA_HWADDR, sizeof(phw), &phw);
+                int len = dev_parse_header(entskb, phw.hw_addr);
+                if (len) {
+                        phw.hw_addrlen = htons(len);
+                        NFA_PUT(skb, NFQA_HWADDR, sizeof(phw), &phw);
+                }
         }
 
         if (entskb->tstamp.tv64) {
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index c5244b309640..c9ee343c2a6c 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -519,10 +519,8 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
                 sll->sll_ifindex = orig_dev->ifindex;
         else
                 sll->sll_ifindex = dev->ifindex;
-        sll->sll_halen = 0;
 
-        if (dev->hard_header_parse)
-                sll->sll_halen = dev->hard_header_parse(skb, sll->sll_addr);
+        sll->sll_halen = dev_parse_header(skb, sll->sll_addr);
 
         PACKET_SKB_CB(skb)->origlen = skb->len;
 
@@ -658,9 +656,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
         h->tp_usec = tv.tv_usec;
 
         sll = (struct sockaddr_ll*)((u8*)h + TPACKET_ALIGN(sizeof(*h)));
-        sll->sll_halen = 0;
-        if (dev->hard_header_parse)
-                sll->sll_halen = dev->hard_header_parse(skb, sll->sll_addr);
+        sll->sll_halen = dev_parse_header(skb, sll->sll_addr);
         sll->sll_family = AF_PACKET;
         sll->sll_hatype = dev->type;
         sll->sll_protocol = skb->protocol;