diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-04 14:28:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-04 14:28:58 -0800 |
| commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
| tree | e96ef46426d293b730a305b5185ba5412c9172d4 /drivers/net/bnx2x | |
| parent | 2b7bcebf958c74124220ee8103024def8597b36c (diff) | |
| parent | 1e6d93e45b231b3ae87c01902ede2315aacfe976 (diff) | |
| download | kernel_samsung_smdk4412-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.zip kernel_samsung_smdk4412-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.gz kernel_samsung_smdk4412-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2x')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index ae8d20a..5e3f948 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -2301,15 +2301,10 @@ static void bnx2x_rxq_set_mac_filters(struct bnx2x *bp, u16 cl_id, u32 filters) /* accept matched ucast */ drop_all_ucast = 0; } - if (filters & BNX2X_ACCEPT_MULTICAST) { + if (filters & BNX2X_ACCEPT_MULTICAST) /* accept matched mcast */ drop_all_mcast = 0; - if (IS_MF_SI(bp)) - /* since mcast addresses won't arrive with ovlan, - * fw needs to accept all of them in - * switch-independent mode */ - accp_all_mcast = 1; - } + if (filters & BNX2X_ACCEPT_ALL_UNICAST) { /* accept all mcast */ drop_all_ucast = 0; |