diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-24 22:54:17 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-24 22:54:17 (GMT) |
| commit | 9539ce2253ab1b054e9b0daf0abe0fd4263e1820 (patch) | |
| tree | 3d499436eef8fb5f9bceb668eb8338a0f135308c /drivers/net/forcedeth.c | |
| parent | c2b38989cf2b0c003a9cf57efc833ab16d33901e (diff) | |
| parent | 096a458c3a9c717563e98b0a2ce69821459a6660 (diff) | |
| download | linux-fsl-qoriq-9539ce2253ab1b054e9b0daf0abe0fd4263e1820.tar.xz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
forcedeth: fix cpu irq mask
chelsio parenthesis fix
spidernet: skb used after netif_receive_skb
meth driver renovation
remove unnecessary dependency on VIA velocity config
fix compiler warning in fixed.c
asix.c - Add Belkin F5D5055 ids
ucc_geth:trivial fix
ucc_geth: Fix MODULE_DEVICE_TABLE() duplication
[PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free
[PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check
[PATCH] libertas: skb dereferenced after netif_rx
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 7a01802..4154fd0 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -195,7 +195,7 @@ enum { #define NVREG_IRQ_TX_FORCED 0x0100 #define NVREG_IRQ_RECOVER_ERROR 0x8000 #define NVREG_IRQMASK_THROUGHPUT 0x00df -#define NVREG_IRQMASK_CPU 0x0040 +#define NVREG_IRQMASK_CPU 0x0060 #define NVREG_IRQ_TX_ALL (NVREG_IRQ_TX_ERR|NVREG_IRQ_TX_OK|NVREG_IRQ_TX_FORCED) #define NVREG_IRQ_RX_ALL (NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_RX_FORCED) #define NVREG_IRQ_OTHER (NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_RECOVER_ERROR) |