diff options
| author | David S. Miller | 2009-09-02 09:32:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-09-02 09:32:56 +0200 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/bnx2.h | |
| parent | ipv6: ip6_push_pending_frames() should increment IPSTATS_MIB_OUTDISCARDS (diff) | |
| parent | pkt_sched: Revert tasklet_hrtimer changes. (diff) | |
| download | kernel-qcow2-linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.gz kernel-qcow2-linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.xz kernel-qcow2-linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 7544188b6541..6c7f795d12de 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -6903,6 +6903,7 @@ struct bnx2 { u32 idle_chk_status_idx; #ifdef BCM_CNIC + struct mutex cnic_lock; struct cnic_eth_dev cnic_eth_dev; #endif |