net: Push protocol type directly down to header_ops->cache()

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 3 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 50bd960983e0..8f7e1d8d92a0 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1247,7 +1247,7 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst,
         hh->hh_type = protocol;
         atomic_set(&hh->hh_refcnt, 2);
 
-        if (dev->header_ops->cache(n, hh)) {
+        if (dev->header_ops->cache(n, hh, protocol)) {
                 kfree(hh);
                 return;
         }
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 44d2b42fda56..5cffb63f481a 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -233,9 +233,8 @@ EXPORT_SYMBOL(eth_header_parse);
  * @hh: destination cache entry
  * Create an Ethernet header template from the neighbour.
  */
-int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh)
+int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type)
 {
-        __be16 type = hh->hh_type;
         struct ethhdr *eth;
         const struct net_device *dev = neigh->dev;