diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
| commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
| tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /drivers/net/usb | |
| parent | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (diff) | |
| parent | 10c435f18b8cb78a5870c08d52955594f5ec9c31 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/rndis_host.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index d032bba9bc4c..0caa8008c51c 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
| @@ -418,6 +418,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
| 418 | goto halt_fail_and_release; | 418 | goto halt_fail_and_release; |
| 419 | } | 419 | } |
| 420 | memcpy(net->dev_addr, bp, ETH_ALEN); | 420 | memcpy(net->dev_addr, bp, ETH_ALEN); |
| 421 | memcpy(net->perm_addr, bp, ETH_ALEN); | ||
| 421 | 422 | ||
| 422 | /* set a nonzero filter to enable data transfers */ | 423 | /* set a nonzero filter to enable data transfers */ |
| 423 | memset(u.set, 0, sizeof *u.set); | 424 | memset(u.set, 0, sizeof *u.set); |