diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:04:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:04:44 -0400 |
commit | f8965467f366fd18f01feafb5db10512d7b4422c (patch) | |
tree | 3706a9cd779859271ca61b85c63a1bc3f82d626e /net/tipc/link.h | |
parent | a26272e5200765691e67d6780e52b32498fdb659 (diff) | |
parent | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (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: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add support for active DA cables
ixgbe: dcb, do not tag tc_prio_control frames
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: always enable vlan strip/insert when DCB is enabled
ixgbe: remove some redundant code in setting FCoE FIP filter
ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
ixgbe: fix header len when unsplit packet overflows to data buffer
ipv6: Never schedule DAD timer on dead address
ipv6: Use POSTDAD state
ipv6: Use state_lock to protect ifa state
ipv6: Replace inet6_ifaddr->dead with state
cxgb4: notify upper drivers if the device is already up when they load
cxgb4: keep interrupts available when the ports are brought down
cxgb4: fix initial addition of MAC address
cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
cnic: Convert cnic_local_flags to atomic ops.
can: Fix SJA1000 command register writes on SMP systems
bridge: fix build for CONFIG_SYSFS disabled
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
...
Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).
Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
Diffstat (limited to 'net/tipc/link.h')
-rw-r--r-- | net/tipc/link.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/net/tipc/link.h b/net/tipc/link.h index 6a51e38ad25..2e5385c47d3 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h | |||
@@ -292,4 +292,39 @@ static inline u32 lesser(u32 left, u32 right) | |||
292 | return less_eq(left, right) ? left : right; | 292 | return less_eq(left, right) ? left : right; |
293 | } | 293 | } |
294 | 294 | ||
295 | |||
296 | /* | ||
297 | * Link status checking routines | ||
298 | */ | ||
299 | |||
300 | static inline int link_working_working(struct link *l_ptr) | ||
301 | { | ||
302 | return (l_ptr->state == WORKING_WORKING); | ||
303 | } | ||
304 | |||
305 | static inline int link_working_unknown(struct link *l_ptr) | ||
306 | { | ||
307 | return (l_ptr->state == WORKING_UNKNOWN); | ||
308 | } | ||
309 | |||
310 | static inline int link_reset_unknown(struct link *l_ptr) | ||
311 | { | ||
312 | return (l_ptr->state == RESET_UNKNOWN); | ||
313 | } | ||
314 | |||
315 | static inline int link_reset_reset(struct link *l_ptr) | ||
316 | { | ||
317 | return (l_ptr->state == RESET_RESET); | ||
318 | } | ||
319 | |||
320 | static inline int link_blocked(struct link *l_ptr) | ||
321 | { | ||
322 | return (l_ptr->exp_msg_count || l_ptr->blocked); | ||
323 | } | ||
324 | |||
325 | static inline int link_congested(struct link *l_ptr) | ||
326 | { | ||
327 | return (l_ptr->out_queue_size >= l_ptr->queue_limit[0]); | ||
328 | } | ||
329 | |||
295 | #endif | 330 | #endif |