diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-03 16:21:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-03 16:21:02 -0700 |
| commit | 316343e2cfd9a4bb4c70d0e1991e7a74840fe29e (patch) | |
| tree | 3608312dfc3c6af92c9abb79f0b8984d0473feee /net/tipc/zone.c | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
| parent | fca1287a3a9246d4facc27a0a455fada18fd1164 (diff) | |
| download | op-kernel-dev-316343e2cfd9a4bb4c70d0e1991e7a74840fe29e.zip op-kernel-dev-316343e2cfd9a4bb4c70d0e1991e7a74840fe29e.tar.gz | |
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:
bnx2x: Accessing un-mapped page
ath9k: Fix TX control flag use for no ACK and RTS/CTS
ath9k: Fix TX status reporting
iwlwifi: fix STATUS_EXIT_PENDING is not set on pci_remove
iwlwifi: call apm stop on exit
iwlwifi: fix Tx cmd memory allocation failure handling
iwlwifi: fix rx_chain computation
iwlwifi: fix station mimo power save values
iwlwifi: remove false rxon if rx chain changes
iwlwifi: fix hidden ssid discovery in passive channels
iwlwifi: W/A for the TSF correction in IBSS
netxen: Remove workaround for chipset quirk
pcnet-cs, axnet_cs: add new IDs, remove dup ID with less info
ixgbe: initialize interrupt throttle rate
net/usb/pegasus: avoid hundreds of diagnostics
tipc: Don't use structure names which easily globally conflict.
Diffstat (limited to 'net/tipc/zone.c')
| -rw-r--r-- | net/tipc/zone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/zone.c b/net/tipc/zone.c index 3506f85..2c01ba2 100644 --- a/net/tipc/zone.c +++ b/net/tipc/zone.c @@ -111,10 +111,10 @@ void tipc_zone_send_external_routes(struct _zone *z_ptr, u32 dest) } } -struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref) +struct tipc_node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref) { struct cluster *c_ptr; - struct node *n_ptr; + struct tipc_node *n_ptr; u32 c_num; if (!z_ptr) |
