diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-03 19:21:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-03 19:21:02 -0400 |
| commit | 316343e2cfd9a4bb4c70d0e1991e7a74840fe29e (patch) | |
| tree | 3608312dfc3c6af92c9abb79f0b8984d0473feee /net/tipc/bearer.h | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
| parent | fca1287a3a9246d4facc27a0a455fada18fd1164 (diff) | |
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/bearer.h')
| -rw-r--r-- | net/tipc/bearer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 6a36b6600e6c..ca5734892713 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h | |||
| @@ -104,7 +104,7 @@ struct bearer { | |||
| 104 | u32 continue_count; | 104 | u32 continue_count; |
| 105 | int active; | 105 | int active; |
| 106 | char net_plane; | 106 | char net_plane; |
| 107 | struct node_map nodes; | 107 | struct tipc_node_map nodes; |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
| 110 | struct bearer_name { | 110 | struct bearer_name { |