diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
commit | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch) | |
tree | 454d1842b1833d976da62abcbd5c47521ebe9bd7 /drivers/net/niu.h | |
parent | 54a696bd07c14d3b1192d03ce7269bc59b45209a (diff) | |
parent | eb56092fc168bf5af199d47af50c0d84a96db898 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'drivers/net/niu.h')
-rw-r--r-- | drivers/net/niu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 180ca8ae93de..e1a7392e8d70 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
@@ -3243,12 +3243,12 @@ struct niu { | |||
3243 | #define NIU_FLAGS_XMAC 0x00010000 /* 0=BMAC 1=XMAC */ | 3243 | #define NIU_FLAGS_XMAC 0x00010000 /* 0=BMAC 1=XMAC */ |
3244 | 3244 | ||
3245 | u32 msg_enable; | 3245 | u32 msg_enable; |
3246 | char irq_name[NIU_NUM_RXCHAN+NIU_NUM_TXCHAN+3][IFNAMSIZ + 6]; | ||
3246 | 3247 | ||
3247 | /* Protects hw programming, and ring state. */ | 3248 | /* Protects hw programming, and ring state. */ |
3248 | spinlock_t lock; | 3249 | spinlock_t lock; |
3249 | 3250 | ||
3250 | const struct niu_ops *ops; | 3251 | const struct niu_ops *ops; |
3251 | struct net_device_stats net_stats; | ||
3252 | union niu_mac_stats mac_stats; | 3252 | union niu_mac_stats mac_stats; |
3253 | 3253 | ||
3254 | struct rx_ring_info *rx_rings; | 3254 | struct rx_ring_info *rx_rings; |