commit e69dd336ee3a05a589629b505b18ba5e7a5b4c54
author David S. Miller <davem@davemloft.net> Tue Jul 12 23:28:12 2011 -0700
committer David S. Miller <davem@davemloft.net> Wed Jul 13 02:29:59 2011 -0700
tree ce221d370029164d5ea498ab0da50672d03a5b0e
parent 3769cffb1c48f64640ffab7ce3bffe867342c0f0

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

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

net/core/neighbour.c

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 50bd9609..8f7e1d8 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1247,7 +1247,7 @@
 	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;
 	}

net/ethernet/eth.c

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 44d2b42..5cffb63 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -233,9 +233,8 @@
  * @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;