]> git.karo-electronics.de Git - karo-tx-linux.git/commit
myri10ge: do not use mgp->max_intr_slots before loading the firmware
authorBrice Goglin <brice@myri.com>
Wed, 23 Jul 2008 08:16:13 +0000 (10:16 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 1 Aug 2008 19:43:06 +0000 (12:43 -0700)
commit552e0bfaac56608f37b497db013e9a6d38df1b11
treeb91b01af1a4bed41647865ec070a12a9711ef3a7
parentaf30bd03def39b9b9d26780c37ba32d51cad2772
myri10ge: do not use mgp->max_intr_slots before loading the firmware

part of commit 0dcffac1a329be69bab0ac604bf7283737108e68 upstream
(the upstream multislice patch contains this fix within a large
 rework of the code since there is one rx_done ring per slice. The
 old allocating is replaced by a call to myri10ge_probe_slices())

Allocating the rx_done ring requires mgp->max_intr_slots to
be valid, which requires that we already loaded the firmware
we are going to use with this ring.
So move the allocating after myri10ge_load_firmware()
(but keep it before myri10ge_reset() which already needs the
 rx_done ring).

If fixedsa regression where loading the driver would not
appear to do anything. Regression introduced in 2.6.26-rc3 by
commit 014377a1df693ff30a9e8b69f0bbb0a38e601f75

Reported and patch tested by Lukas Hejtmanek at
http://lkml.org/lkml/2008/7/22/305
Reproduced and patch tested also by me.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/myri10ge/myri10ge.c