diff options
| author | Mursalin Akon <makon@nvidia.com> | 2013-08-05 14:59:38 -0700 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2013-08-06 09:14:13 -0700 |
| commit | fc90609debf45e79712caabb7668e6f32eb02b69 (patch) | |
| tree | 777c0c36439bc90aaea87338dee05d46bc237103 /drivers/net/r8169.c | |
| parent | c75951a17ef41e0cc108f1ced0213bc2620f6534 (diff) | |
Make firmware loading of R8169 optional
According to Realtek, the firmware provides
power optimizations. The driver works without
the firmware. Plus, there are scenarios where
the firmware is not available, which makes the
driver wait at request_firmware call (i.e.,
60 sec wait).
Bug 1236060
Bug 991551
Change-Id: Ifcaa4b2dd48c4111ded33cf2bade7dc1f6422821
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/258353
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 6d657cabb951..a7ff1005ea64 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1327,7 +1327,11 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) static const char *rtl_lookup_firmware_name(struct rtl8169_private *tp) { +#ifdef CONFIG_R8169_FW_LOAD return rtl_chip_infos[tp->mac_version].fw_name; +#else + return NULL; +#endif } static void rtl8169_get_drvinfo(struct net_device *dev, |