diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-29 12:31:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-29 12:31:03 +0200 |
| commit | a5b17df04c4ad8f25fc598fce37fccb4b387c94c (patch) | |
| tree | 2d0084f6db86362eb067b617ff8470f255ba37e7 /drivers/net/usb/rndis_host.c | |
| parent | tcp: Reorganize tcp_sock to fill 64-bit holes & improve locality (diff) | |
| parent | via-velocity: use memmove (diff) | |
| download | linux-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.tar.xz linux-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.zip | |
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) struct rndis_set_c *set_c; struct rndis_halt *halt; } u; - u32 tmp, phym_unspec; - __le32 *phym; + u32 tmp; + __le32 phym_unspec, *phym; int reply_len; unsigned char *bp; |