diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2009-01-20 01:57:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-20 01:57:45 +0100 |
| commit | 9e9fd12dc0679643c191fc9795a3021807e77de4 (patch) | |
| tree | 926f64934af8f762b92bd5b103d37ebe151a2ada /drivers/net/tg3.h | |
| parent | ixgbe: Fix usage of netif_*_all_queues() with netif_carrier_{off|on}() (diff) | |
| download | linux-9e9fd12dc0679643c191fc9795a3021807e77de4.tar.xz linux-9e9fd12dc0679643c191fc9795a3021807e77de4.zip | |
tg3: Fix firmware loading
This patch modifies how the tg3 driver handles device firmware.
The patch starts by consolidating David Woodhouse's earlier patch under
the same name. Specifically, the patch moves the request_firmware call
into a separate tg3_request_firmware() function and calls that function
from tg3_open() rather than tg3_init_one().
The patch then goes on to limit the number of devices that will make
request_firmware calls. The original firmware patch unnecessarily
requested TSO firmware for devices that did not need it. This patch
reduces the set of devices making TSO firmware patches to approximately
the following device set : 5703, 5704, and 5705.
Finally, the patch reduces the effects of a request_firmware() failure.
For those devices that are requesting TSO firmware, the driver will turn
off the TSO capability. If TSO firmware becomes available at a later
time, the device can be closed and then opened again to reacquire the
TSO capability.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index ae5da603c6af..508def3e077f 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2764,6 +2764,7 @@ struct tg3 { struct ethtool_coalesce coal; /* firmware info */ + const char *fw_needed; const struct firmware *fw; u32 fw_len; /* includes BSS */ }; |