diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:49:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:49:03 -0500 |
| commit | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (patch) | |
| tree | de05bf460a181d5ff68257418021e10fa262da93 /include/linux/netdevice.h | |
| parent | 06d61cbf7c2522f43c09d5bb050acd0bd31812c0 (diff) | |
| parent | 691b73b13220886aefacb7c7f7ace7f528bbf800 (diff) | |
Merge branch 'bonding-sysfs' of git://git.tuxdriver.com/git/netdev-jwl
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 97bbca6b2960..07e114d48bbb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -684,6 +684,7 @@ extern int netif_rx(struct sk_buff *skb); | |||
| 684 | extern int netif_rx_ni(struct sk_buff *skb); | 684 | extern int netif_rx_ni(struct sk_buff *skb); |
| 685 | #define HAVE_NETIF_RECEIVE_SKB 1 | 685 | #define HAVE_NETIF_RECEIVE_SKB 1 |
| 686 | extern int netif_receive_skb(struct sk_buff *skb); | 686 | extern int netif_receive_skb(struct sk_buff *skb); |
| 687 | extern int dev_valid_name(const char *name); | ||
| 687 | extern int dev_ioctl(unsigned int cmd, void __user *); | 688 | extern int dev_ioctl(unsigned int cmd, void __user *); |
| 688 | extern int dev_ethtool(struct ifreq *); | 689 | extern int dev_ethtool(struct ifreq *); |
| 689 | extern unsigned dev_get_flags(const struct net_device *); | 690 | extern unsigned dev_get_flags(const struct net_device *); |