diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 15:25:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 15:25:59 -0800 |
| commit | caf8394524fdc039b090cd3af99157e9e76f4f06 (patch) | |
| tree | c58af82b15459a55a66bfae3a9d83a23c2d2c62c /drivers/net/benet/be_main.c | |
| parent | 6656b3fc8aba2eb7ca00c06c7fe4917938b0b652 (diff) | |
| parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) | |
| download | linux-caf8394524fdc039b090cd3af99157e9e76f4f06.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)
net: fix kernel-doc for sk_filter_rcu_release
be2net: Fix to avoid firmware update when interface is not open.
netfilter: fix IP_VS dependencies
net: irda: irttp: sync error paths of data- and udata-requests
ipv6: Expose reachable and retrans timer values as msecs
ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies
3c59x: fix build failure on !CONFIG_PCI
ipg.c: remove id [SUNDANCE, 0x1021]
net: caif: spi: fix potential NULL dereference
ath9k_htc: Avoid setting QoS control for non-QoS frames
net: zero kobject in rx_queue_release
net: Fix duplicate volatile warning.
MAINTAINERS: Add stmmac maintainer
bonding: fix a race in IGMP handling
cfg80211: fix can_beacon_sec_chan, reenable HT40
gianfar: fix signedness issue
net: bnx2x: fix error value sign
8139cp: fix checksum broken
r8169: fix checksum broken
rds: Integer overflow in RDS cmsg handling
...
Diffstat (limited to 'drivers/net/benet/be_main.c')
| -rw-r--r-- | drivers/net/benet/be_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index c36cd2ffbadc..93354eee2cfd 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -2458,6 +2458,12 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) int status, i = 0, num_imgs = 0; const u8 *p; + if (!netif_running(adapter->netdev)) { + dev_err(&adapter->pdev->dev, + "Firmware load not allowed (interface is down)\n"); + return -EPERM; + } + strcpy(fw_file, func); status = request_firmware(&fw, fw_file, &adapter->pdev->dev); |