diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
| commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
| tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /include/linux/netdevice.h | |
| parent | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b72f756542d0..97bbca6b2960 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -931,6 +931,13 @@ extern int netdev_max_backlog; | |||
| 931 | extern int weight_p; | 931 | extern int weight_p; |
| 932 | extern int netdev_set_master(struct net_device *dev, struct net_device *master); | 932 | extern int netdev_set_master(struct net_device *dev, struct net_device *master); |
| 933 | extern int skb_checksum_help(struct sk_buff *skb, int inward); | 933 | extern int skb_checksum_help(struct sk_buff *skb, int inward); |
| 934 | #ifdef CONFIG_BUG | ||
| 935 | extern void netdev_rx_csum_fault(struct net_device *dev); | ||
| 936 | #else | ||
| 937 | static inline void netdev_rx_csum_fault(struct net_device *dev) | ||
| 938 | { | ||
| 939 | } | ||
| 940 | #endif | ||
| 934 | /* rx skb timestamps */ | 941 | /* rx skb timestamps */ |
| 935 | extern void net_enable_timestamp(void); | 942 | extern void net_enable_timestamp(void); |
| 936 | extern void net_disable_timestamp(void); | 943 | extern void net_disable_timestamp(void); |