diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-04-10 14:38:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:38:31 -0400 |
| commit | ecd159fc5f415fa742d5daa5b43200606e6ad493 (patch) | |
| tree | 3f2996088bdf0d275d6b5fdb3cc184f80a12e21f /net/netfilter/nf_conntrack_proto_tcp.c | |
| parent | Make the "word-at-a-time" helper functions more commonly usable (diff) | |
| parent | netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net (diff) | |
| download | linux-dev-ecd159fc5f415fa742d5daa5b43200606e6ad493.tar.xz linux-dev-ecd159fc5f415fa742d5daa5b43200606e6ad493.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_tcp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 361eade62a09..0d07a1dcf605 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -584,8 +584,8 @@ static bool tcp_in_window(const struct nf_conn *ct, * Let's try to use the data from the packet. */ sender->td_end = end; - win <<= sender->td_scale; - sender->td_maxwin = (win == 0 ? 1 : win); + swin = win << sender->td_scale; + sender->td_maxwin = (swin == 0 ? 1 : swin); sender->td_maxend = end + sender->td_maxwin; /* * We haven't seen traffic in the other direction yet |