Author: weongyo
Date: Wed Apr 21 00:05:22 2010
New Revision: 206964
URL: http://svn.freebsd.org/changeset/base/206964
Log:
MFC r204437:
fixes a bug to load firmware images for LP PHY. For LP PHY always,
`lp_' string is contained in its full image names.
Modified:
stable/8/sys/dev/bwn/if_bwn.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/dev/uath/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/siba/siba_cc.c (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/dev/bwn/if_bwn.c
==============================================================================
--- stable/8/sys/dev/bwn/if_bwn.c Wed Apr 21 00:02:48 2010
(r206963)
+++ stable/8/sys/dev/bwn/if_bwn.c Wed Apr 21 00:05:22 2010
(r206964)
@@ -7789,8 +7789,9 @@ bwn_fw_get(struct bwn_mac *mac, enum bwn
bwn_do_release_fw(bfw);
}
- snprintf(namebuf, sizeof(namebuf), "bwn%s_v4_%s",
- (type == BWN_FWTYPE_OPENSOURCE) ? "-open" : "", name);
+ snprintf(namebuf, sizeof(namebuf), "bwn%s_v4_%s%s",
+ (type == BWN_FWTYPE_OPENSOURCE) ? "-open" : "",
+ (mac->mac_phy.type == BWN_PHYTYPE_LP) ? "lp_" : "", name);
/* XXX Sleeping on "fwload" with the non-sleepable locks held */
fw = firmware_get(namebuf);
if (fw == NULL) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
