diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netdevice.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b33d084712fa..aae9ec367f5d 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -657,7 +657,7 @@ struct net_device | |||
657 | void (*vlan_rx_kill_vid)(struct net_device *dev, | 657 | void (*vlan_rx_kill_vid)(struct net_device *dev, |
658 | unsigned short vid); | 658 | unsigned short vid); |
659 | 659 | ||
660 | int (*hard_header_parse)(struct sk_buff *skb, | 660 | int (*hard_header_parse)(const struct sk_buff *skb, |
661 | unsigned char *haddr); | 661 | unsigned char *haddr); |
662 | int (*neigh_setup)(struct net_device *dev, struct neigh_parms *); | 662 | int (*neigh_setup)(struct net_device *dev, struct neigh_parms *); |
663 | #ifdef CONFIG_NETPOLL | 663 | #ifdef CONFIG_NETPOLL |
@@ -809,6 +809,16 @@ static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev, | |||
809 | return dev->hard_header(skb, dev, type, daddr, saddr, len); | 809 | return dev->hard_header(skb, dev, type, daddr, saddr, len); |
810 | } | 810 | } |
811 | 811 | ||
812 | static inline int dev_parse_header(const struct sk_buff *skb, | ||
813 | unsigned char *haddr) | ||
814 | { | ||
815 | const struct net_device *dev = skb->dev; | ||
816 | |||
817 | if (!dev->hard_header_parse) | ||
818 | return 0; | ||
819 | return dev->hard_header_parse(skb, haddr); | ||
820 | } | ||
821 | |||
812 | typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len); | 822 | typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len); |
813 | extern int register_gifconf(unsigned int family, gifconf_func_t * gifconf); | 823 | extern int register_gifconf(unsigned int family, gifconf_func_t * gifconf); |
814 | static inline int unregister_gifconf(unsigned int family) | 824 | static inline int unregister_gifconf(unsigned int family) |