diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/amd8111e.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rw-r--r-- | drivers/net/amd8111e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 2ca880b4c0db..88495c48a81d 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -1398,7 +1398,7 @@ static void amd8111e_set_multicast_list(struct net_device *dev) | |||
| 1398 | mc_filter[1] = mc_filter[0] = 0; | 1398 | mc_filter[1] = mc_filter[0] = 0; |
| 1399 | lp->options &= ~OPTION_MULTICAST_ENABLE; | 1399 | lp->options &= ~OPTION_MULTICAST_ENABLE; |
| 1400 | amd8111e_writeq(*(u64*)mc_filter,lp->mmio + LADRF); | 1400 | amd8111e_writeq(*(u64*)mc_filter,lp->mmio + LADRF); |
| 1401 | /* disable promiscous mode */ | 1401 | /* disable promiscuous mode */ |
| 1402 | writel(PROM, lp->mmio + CMD2); | 1402 | writel(PROM, lp->mmio + CMD2); |
| 1403 | return; | 1403 | return; |
| 1404 | } | 1404 | } |