diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-29 06:31:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-29 06:31:03 -0400 |
| commit | a5b17df04c4ad8f25fc598fce37fccb4b387c94c (patch) | |
| tree | 2d0084f6db86362eb067b617ff8470f255ba37e7 /drivers/net/usb/rndis_host.c | |
| parent | b79eeeb9e48457579cb742cd02e162fcd673c4a3 (diff) | |
| parent | c03571a3e22b821e5be7bda7b166c4554770f489 (diff) | |
Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/usb/rndis_host.c')
| -rw-r--r-- | drivers/net/usb/rndis_host.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index e1177cca8a76..ae467f182c40 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
| @@ -283,8 +283,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
| 283 | struct rndis_set_c *set_c; | 283 | struct rndis_set_c *set_c; |
| 284 | struct rndis_halt *halt; | 284 | struct rndis_halt *halt; |
| 285 | } u; | 285 | } u; |
| 286 | u32 tmp, phym_unspec; | 286 | u32 tmp; |
| 287 | __le32 *phym; | 287 | __le32 phym_unspec, *phym; |
| 288 | int reply_len; | 288 | int reply_len; |
| 289 | unsigned char *bp; | 289 | unsigned char *bp; |
| 290 | 290 | ||