2 files changed, 25 insertions, 14 deletions

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 4c520110b04f..f7a3d7a171c7 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -265,6 +265,18 @@ void eth_header_cache_update(struct hh_cache *hh,
 EXPORT_SYMBOL(eth_header_cache_update);
 
 /**
+ * eth_header_parser_protocol - extract protocol from L2 header
+ * @skb: packet to extract protocol from
+ */
+__be16 eth_header_parse_protocol(const struct sk_buff *skb)
+{
+        const struct ethhdr *eth = eth_hdr(skb);
+
+        return eth->h_proto;
+}
+EXPORT_SYMBOL(eth_header_parse_protocol);
+
+/**
  * eth_prepare_mac_addr_change - prepare for mac change
  * @dev: network device
  * @p: socket address
@@ -346,6 +358,7 @@ const struct header_ops eth_header_ops ____cacheline_aligned = {
         .parse          = eth_header_parse,
         .cache          = eth_header_cache,
         .cache_update   = eth_header_cache_update,
+        .parse_protocol = eth_header_parse_protocol,
 };
 
 /**
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1cd1d83a4be0..8376bc1c1508 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1850,6 +1850,15 @@ oom:
         return 0;
 }
 
+static void packet_parse_headers(struct sk_buff *skb, struct socket *sock)
+{
+        if (!skb->protocol && sock->type == SOCK_RAW) {
+                skb_reset_mac_header(skb);
+                skb->protocol = dev_parse_header_protocol(skb);
+        }
+
+        skb_probe_transport_header(skb);
+}
 
 /*
  *      Output a raw packet to a device layer. This bypasses all the other
@@ -1970,7 +1979,7 @@ retry:
         if (unlikely(extra_len == 4))
                 skb->no_fcs = 1;
 
-        skb_probe_transport_header(skb, 0);
+        packet_parse_headers(skb, sock);
 
         dev_queue_xmit(skb);
         rcu_read_unlock();
@@ -2404,15 +2413,6 @@ static void tpacket_destruct_skb(struct sk_buff *skb)
         sock_wfree(skb);
 }
 
-static void tpacket_set_protocol(const struct net_device *dev,
-                                 struct sk_buff *skb)
-{
-        if (dev->type == ARPHRD_ETHER) {
-                skb_reset_mac_header(skb);
-                skb->protocol = eth_hdr(skb)->h_proto;
-        }
-}
-
 static int __packet_snd_vnet_parse(struct virtio_net_hdr *vnet_hdr, size_t len)
 {
         if ((vnet_hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) &&
@@ -2483,8 +2483,6 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
                         return err;
                 if (!dev_validate_header(dev, skb->data, hdrlen))
                         return -EINVAL;
-                if (!skb->protocol)
-                        tpacket_set_protocol(dev, skb);
 
                 data += hdrlen;
                 to_write -= hdrlen;
@@ -2519,7 +2517,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
                 len = ((to_write > len_max) ? len_max : to_write);
         }
 
-        skb_probe_transport_header(skb, 0);
+        packet_parse_headers(skb, sock);
 
         return tp_len;
 }
@@ -2925,7 +2923,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
                 virtio_net_hdr_set_proto(skb, &vnet_hdr);
         }
 
-        skb_probe_transport_header(skb, reserve);
+        packet_parse_headers(skb, sock);
 
         if (unlikely(extra_len == 4))
                 skb->no_fcs = 1;