diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/net/via-velocity.c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 448772f6cb33..dcbc152306e2 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -2294,7 +2294,7 @@ static void velocity_set_multi(struct net_device *dev) | |||
| 2294 | } | 2294 | } |
| 2295 | 2295 | ||
| 2296 | mac_set_cam_mask(regs, vptr->mCAMmask); | 2296 | mac_set_cam_mask(regs, vptr->mCAMmask); |
| 2297 | rx_mode = (RCR_AM | RCR_AB); | 2297 | rx_mode = RCR_AM | RCR_AB | RCR_AP; |
| 2298 | } | 2298 | } |
| 2299 | if (dev->mtu > 1500) | 2299 | if (dev->mtu > 1500) |
| 2300 | rx_mode |= RCR_AL; | 2300 | rx_mode |= RCR_AL; |