diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-13 02:28:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-13 05:29:59 -0400 |
commit | e69dd336ee3a05a589629b505b18ba5e7a5b4c54 (patch) | |
tree | ce221d370029164d5ea498ab0da50672d03a5b0e /include | |
parent | 3769cffb1c48f64640ffab7ce3bffe867342c0f0 (diff) |
net: Push protocol type directly down to header_ops->cache()
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/etherdevice.h | 2 | ||||
-rw-r--r-- | include/linux/netdevice.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index ab68f785fd19..05955cf09937 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h | |||
@@ -38,7 +38,7 @@ extern int eth_header(struct sk_buff *skb, struct net_device *dev, | |||
38 | const void *daddr, const void *saddr, unsigned len); | 38 | const void *daddr, const void *saddr, unsigned len); |
39 | extern int eth_rebuild_header(struct sk_buff *skb); | 39 | extern int eth_rebuild_header(struct sk_buff *skb); |
40 | extern int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr); | 40 | extern int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr); |
41 | extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh); | 41 | extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type); |
42 | extern void eth_header_cache_update(struct hh_cache *hh, | 42 | extern void eth_header_cache_update(struct hh_cache *hh, |
43 | const struct net_device *dev, | 43 | const struct net_device *dev, |
44 | const unsigned char *haddr); | 44 | const unsigned char *haddr); |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 30f17e42c304..564d89fdddda 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -308,7 +308,7 @@ struct header_ops { | |||
308 | const void *saddr, unsigned len); | 308 | const void *saddr, unsigned len); |
309 | int (*parse)(const struct sk_buff *skb, unsigned char *haddr); | 309 | int (*parse)(const struct sk_buff *skb, unsigned char *haddr); |
310 | int (*rebuild)(struct sk_buff *skb); | 310 | int (*rebuild)(struct sk_buff *skb); |
311 | int (*cache)(const struct neighbour *neigh, struct hh_cache *hh); | 311 | int (*cache)(const struct neighbour *neigh, struct hh_cache *hh, __be16 type); |
312 | void (*cache_update)(struct hh_cache *hh, | 312 | void (*cache_update)(struct hh_cache *hh, |
313 | const struct net_device *dev, | 313 | const struct net_device *dev, |
314 | const unsigned char *haddr); | 314 | const unsigned char *haddr); |