diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /pfinet/linux-src/include/net | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'pfinet/linux-src/include/net')
| -rw-r--r-- | pfinet/linux-src/include/net/pkt_sched.h | 2 | ||||
| -rw-r--r-- | pfinet/linux-src/include/net/tcp.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pfinet/linux-src/include/net/pkt_sched.h b/pfinet/linux-src/include/net/pkt_sched.h index 9911464f..c2ef8656 100644 --- a/pfinet/linux-src/include/net/pkt_sched.h +++ b/pfinet/linux-src/include/net/pkt_sched.h @@ -119,7 +119,7 @@ struct qdisc_rate_table The result: [34]86 is not good choice for QoS router :-( - The things are not so bad, because we may use artifical + The things are not so bad, because we may use artificial clock evaluated by integration of network data flow in the most critical places. diff --git a/pfinet/linux-src/include/net/tcp.h b/pfinet/linux-src/include/net/tcp.h index 0e7e4bb6..abb4b210 100644 --- a/pfinet/linux-src/include/net/tcp.h +++ b/pfinet/linux-src/include/net/tcp.h @@ -713,7 +713,7 @@ extern __inline__ __u32 tcp_recalc_ssthresh(struct tcp_opt *tp) /* TCP timestamps are only 32-bits, this causes a slight * complication on 64-bit systems since we store a snapshot - * of jiffies in the buffer control blocks below. We decidely + * of jiffies in the buffer control blocks below. We decidedly * only use of the low 32-bits of jiffies and hide the ugly * casts with the following macro. */ @@ -1066,7 +1066,7 @@ static inline void tcp_clear_xmit_timer(struct sock *sk, int what) timer = &tp->probe_timer; break; default: - printk(timer_bug_msg); + printk("%s", timer_bug_msg); return; }; if(timer->prev != NULL) @@ -1088,7 +1088,7 @@ static inline int tcp_timer_is_set(struct sock *sk, int what) return tp->probe_timer.prev != NULL; break; default: - printk(timer_bug_msg); + printk("%s", timer_bug_msg); }; return 0; } |