diff options
| author | Linus Torvalds | 2007-06-16 02:05:58 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-06-16 02:05:58 +0200 |
| commit | fa04a008a16ac633a55f41baf9e84b551e613e7e (patch) | |
| tree | 47d851bf415167751d3b8c20449fdd7a035f7220 /include | |
| parent | mm: Fix memory/cpu hotplug section mismatch and oops. (diff) | |
| parent | [RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference (diff) | |
| download | kernel-qcow2-linux-fa04a008a16ac633a55f41baf9e84b551e613e7e.tar.gz kernel-qcow2-linux-fa04a008a16ac633a55f41baf9e84b551e613e7e.tar.xz kernel-qcow2-linux-fa04a008a16ac633a55f41baf9e84b551e613e7e.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference
[TCP]: Fix logic breakage due to DSACK separation
[TCP]: Congestion control API RTT sampling fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ktime.h | 12 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index c762954bda14..2b139f66027f 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -261,6 +261,18 @@ static inline s64 ktime_to_ns(const ktime_t kt) #endif +/** + * ktime_equal - Compares two ktime_t variables to see if they are equal + * @cmp1: comparable1 + * @cmp2: comparable2 + * + * Compare two ktime_t variables, returns 1 if equal + */ +static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2) +{ + return cmp1.tv64 == cmp2.tv64; +} + static inline s64 ktime_to_us(const ktime_t kt) { struct timeval tv = ktime_to_timeval(kt); diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e7367c74e1bb..6f0b2f7d0010 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1579,6 +1579,10 @@ static inline ktime_t net_timedelta(ktime_t t) return ktime_sub(ktime_get_real(), t); } +static inline ktime_t net_invalid_timestamp(void) +{ + return ktime_set(0, 0); +} extern __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len); extern __sum16 __skb_checksum_complete(struct sk_buff *skb); |