diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 10:50:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 10:50:25 +0100 |
| commit | e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec (patch) | |
| tree | 863e0e108f7b7ba2dffc7575bbdfc2d454fc2017 /net/core/tso.c | |
| parent | 44dba3d5d6a10685fb15bd1954e62016334825e0 (diff) | |
| parent | 6e998916dfe327e785e7c2447959b2c1a3ea4930 (diff) | |
| download | talos-obmc-linux-e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec.tar.gz talos-obmc-linux-e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/tso.c')
| -rw-r--r-- | net/core/tso.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/tso.c b/net/core/tso.c index 8c3203c585b0..630b30b4fb53 100644 --- a/net/core/tso.c +++ b/net/core/tso.c @@ -1,6 +1,7 @@ #include <linux/export.h> #include <net/ip.h> #include <net/tso.h> +#include <asm/unaligned.h> /* Calculate expected number of TX descriptors */ int tso_count_descs(struct sk_buff *skb) @@ -23,7 +24,7 @@ void tso_build_hdr(struct sk_buff *skb, char *hdr, struct tso_t *tso, iph->id = htons(tso->ip_id); iph->tot_len = htons(size + hdr_len - mac_hdr_len); tcph = (struct tcphdr *)(hdr + skb_transport_offset(skb)); - tcph->seq = htonl(tso->tcp_seq); + put_unaligned_be32(tso->tcp_seq, &tcph->seq); tso->ip_id++; if (!is_last) { |
