lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 8 Mar 2011 11:44:33 +0200 From: "Dmitry Kravkov" <dmitry@...adcom.com> To: "Stephen Rothwell" <sfr@...b.auug.org.au> cc: "David Miller" <davem@...emloft.net>, "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "Eilon Greenstein" <eilong@...adcom.com>, "Vladislav Zolotarov" <vladz@...adcom.com> Subject: Re: linux-next: manual merge of the net tree with the net-current tree On Mon, 2011-03-07 at 19:09 -0800, Stephen Rothwell wrote: > Just overlapping additions (I think). I have fixed it up (see below) and > can carry the fix as necessary. You are correct it's just an addition and it does not really matter where to do this. But the merge pushed new code in the middle of MAC configuration between MAC and multicast list. It's clearer to put it at the end of MAC/ML/UL block: --- drivers/net/bnx2x/bnx2x_cmn.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index b01b622..9e37675 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c @@ -1498,6 +1498,11 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) /* Clear UC lists configuration */ bnx2x_invalidate_uc_list(bp); + if (bp->pending_max) { + bnx2x_update_max_mf_config(bp, bp->pending_max); + bp->pending_max = 0; + } + if (bp->port.pmf) bnx2x_initial_phy_init(bp, load_mode); -- 1.7.2.2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists