diff options
| author | Len Brown <len.brown@intel.com> | 2004-11-30 17:04:04 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-11-30 17:04:04 -0500 |
| commit | f2751c96587e903bcf68f32e646cab5f02600d36 (patch) | |
| tree | d4f063479c0df0f53d5f139f7a2aa2dc20ca3e0c /include | |
| parent | 86768d2c54e5af2a07d15ee14937c482a195f6af (diff) | |
| parent | 37e19a489ded6daeb46cc8f55f24b284db981cc4 (diff) | |
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gen_stats.h | 5 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 | ||||
| -rw-r--r-- | include/linux/usbdevice_fs.h | 25 | ||||
| -rw-r--r-- | include/net/udp.h | 2 |
4 files changed, 8 insertions, 25 deletions
diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h index ab631c3571ce..13f4e74609ac 100644 --- a/include/linux/gen_stats.h +++ b/include/linux/gen_stats.h @@ -14,6 +14,7 @@ enum { #define TCA_STATS_MAX (__TCA_STATS_MAX - 1) /** + * struct gnet_stats_basic - byte/packet throughput statistics * @bytes: number of seen bytes * @packets: number of seen packets */ @@ -24,6 +25,7 @@ struct gnet_stats_basic }; /** + * struct gnet_stats_rate_est - rate estimator * @bps: current byte rate * @pps: current packet rate */ @@ -34,10 +36,12 @@ struct gnet_stats_rate_est }; /** + * struct gnet_stats_queue - queuing statistics * @qlen: queue length * @backlog: backlog size of queue * @drops: number of dropped packets * @requeues: number of requeues + * @overlimits: number of enqueues over the limit */ struct gnet_stats_queue { @@ -49,6 +53,7 @@ struct gnet_stats_queue }; /** + * struct gnet_estimator - rate estimator configuration * @interval: sampling period * @ewma_log: the log of measurement window weight */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 5cfcf8941445..f1946ad646e4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1087,6 +1087,7 @@ #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE 0x0065 #define PCI_DEVICE_ID_NVIDIA_NVENET_2 0x0066 #define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a +#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS 0x0084 #define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085 #define PCI_DEVICE_ID_NVIDIA_NVENET_4 0x0086 #define PCI_DEVICE_ID_NVIDIA_NVENET_5 0x008c diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h index af49afaf7bb4..aed8193eb420 100644 --- a/include/linux/usbdevice_fs.h +++ b/include/linux/usbdevice_fs.h @@ -144,29 +144,4 @@ struct usbdevfs_hub_portinfo { #define USBDEVFS_DISCONNECT _IO('U', 22) #define USBDEVFS_CONNECT _IO('U', 23) -/* --------------------------------------------------------------------- */ - -#ifdef __KERNEL__ - -#include <linux/list.h> -#include <asm/semaphore.h> - - -struct dev_state { - struct list_head list; /* state list */ - struct usb_device *dev; - struct file *file; - spinlock_t lock; /* protects the async urb lists */ - struct list_head async_pending; - struct list_head async_completed; - wait_queue_head_t wait; /* wake up if a request completed */ - unsigned int discsignr; - struct task_struct *disctask; - void __user *disccontext; - unsigned long ifclaimed; -}; - -#endif /* __KERNEL__ */ - -/* --------------------------------------------------------------------- */ #endif /* _LINUX_USBDEVICE_FS_H */ diff --git a/include/net/udp.h b/include/net/udp.h index 2ef99a71bc30..c496d10101db 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -71,6 +71,8 @@ extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk, extern int udp_rcv(struct sk_buff *skb); extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg); extern int udp_disconnect(struct sock *sk, int flags); +extern unsigned int udp_poll(struct file *file, struct socket *sock, + poll_table *wait); DECLARE_SNMP_STAT(struct udp_mib, udp_statistics); #define UDP_INC_STATS(field) SNMP_INC_STATS(udp_statistics, field) |