aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5897b4ea5a3f..2007f3b44d05 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -261,7 +261,6 @@ struct header_ops {
261 unsigned short type, const void *daddr, 261 unsigned short type, const void *daddr,
262 const void *saddr, unsigned int len); 262 const void *saddr, unsigned int len);
263 int (*parse)(const struct sk_buff *skb, unsigned char *haddr); 263 int (*parse)(const struct sk_buff *skb, unsigned char *haddr);
264 int (*rebuild)(struct sk_buff *skb);
265 int (*cache)(const struct neighbour *neigh, struct hh_cache *hh, __be16 type); 264 int (*cache)(const struct neighbour *neigh, struct hh_cache *hh, __be16 type);
266 void (*cache_update)(struct hh_cache *hh, 265 void (*cache_update)(struct hh_cache *hh,
267 const struct net_device *dev, 266 const struct net_device *dev,
@@ -1346,7 +1345,7 @@ enum netdev_priv_flags {
1346 * if one wants to override the ndo_*() functions 1345 * if one wants to override the ndo_*() functions
1347 * @ethtool_ops: Management operations 1346 * @ethtool_ops: Management operations
1348 * @fwd_ops: Management operations 1347 * @fwd_ops: Management operations
1349 * @header_ops: Includes callbacks for creating,parsing,rebuilding,etc 1348 * @header_ops: Includes callbacks for creating,parsing,caching,etc
1350 * of Layer 2 headers. 1349 * of Layer 2 headers.
1351 * 1350 *
1352 * @flags: Interface flags (a la BSD) 1351 * @flags: Interface flags (a la BSD)
@@ -2399,15 +2398,6 @@ static inline int dev_parse_header(const struct sk_buff *skb,
2399 return dev->header_ops->parse(skb, haddr); 2398 return dev->header_ops->parse(skb, haddr);
2400} 2399}
2401 2400
2402static inline int dev_rebuild_header(struct sk_buff *skb)
2403{
2404 const struct net_device *dev = skb->dev;
2405
2406 if (!dev->header_ops || !dev->header_ops->rebuild)
2407 return 0;
2408 return dev->header_ops->rebuild(skb);
2409}
2410
2411typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len); 2401typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
2412int register_gifconf(unsigned int family, gifconf_func_t *gifconf); 2402int register_gifconf(unsigned int family, gifconf_func_t *gifconf);
2413static inline int unregister_gifconf(unsigned int family) 2403static inline int unregister_gifconf(unsigned int family)