diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-28 21:28:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-28 21:28:46 -0700 |
| commit | 332e4af80d1214fbf0e263e1408fc7c5b64ecdd6 (patch) | |
| tree | 7c8f8ada7ab8fc9cb2497d95e52dce4d2c4493a3 /include | |
| parent | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (diff) | |
| parent | be0976be9148f31ee0d1997354c3e30ff8d07587 (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dm9000.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/rndis_host.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h index a3750462f9e..fc82446b642 100644 --- a/include/linux/dm9000.h +++ b/include/linux/dm9000.h @@ -21,6 +21,7 @@ #define DM9000_PLATF_32BITONLY (0x0004) #define DM9000_PLATF_EXT_PHY (0x0008) #define DM9000_PLATF_NO_EEPROM (0x0010) +#define DM9000_PLATF_SIMPLE_PHY (0x0020) /* Use NSR to find LinkStatus */ /* platfrom data for platfrom device structure's platfrom_data field */ diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h index 29d6458ecb8..0a6e6d4b929 100644 --- a/include/linux/usb/rndis_host.h +++ b/include/linux/usb/rndis_host.h @@ -260,7 +260,8 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */ extern void rndis_status(struct usbnet *dev, struct urb *urb); -extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf); +extern int +rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen); extern int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags); extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf); |