diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/benet/be_main.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/benet/be_main.c')
| -rw-r--r-- | drivers/net/benet/be_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 289c73aa6875..1bb763cda3ad 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
| @@ -703,7 +703,7 @@ static void be_set_multicast_list(struct net_device *netdev) | |||
| 703 | goto done; | 703 | goto done; |
| 704 | } | 704 | } |
| 705 | 705 | ||
| 706 | /* BE was previously in promiscous mode; disable it */ | 706 | /* BE was previously in promiscuous mode; disable it */ |
| 707 | if (adapter->promiscuous) { | 707 | if (adapter->promiscuous) { |
| 708 | adapter->promiscuous = false; | 708 | adapter->promiscuous = false; |
| 709 | be_cmd_promiscuous_config(adapter, adapter->port_num, 0); | 709 | be_cmd_promiscuous_config(adapter, adapter->port_num, 0); |