Commit 76ac8940 authored by Hannes Eder's avatar Hannes Eder Committed by Patrick McHardy

netfilter: nf_nat_helper: tidy up adjust_tcp_sequence

The variable 'other_way' gets initialized but is not read afterwards,
so remove it.  Pass the right arguments to a pr_debug call.

While being at tidy up a bit and it fix this checkpatch warning:
  WARNING: suspect code indent for conditional statements
Signed-off-by: default avatarHannes Eder <heder@google.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 5ae27aa2
...@@ -41,18 +41,14 @@ adjust_tcp_sequence(u32 seq, ...@@ -41,18 +41,14 @@ adjust_tcp_sequence(u32 seq,
struct nf_conn *ct, struct nf_conn *ct,
enum ip_conntrack_info ctinfo) enum ip_conntrack_info ctinfo)
{ {
int dir; enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
struct nf_nat_seq *this_way, *other_way;
struct nf_conn_nat *nat = nfct_nat(ct); struct nf_conn_nat *nat = nfct_nat(ct);
struct nf_nat_seq *this_way = &nat->seq[dir];
pr_debug("adjust_tcp_sequence: seq = %u, sizediff = %d\n", seq, seq); pr_debug("adjust_tcp_sequence: seq = %u, sizediff = %d\n",
seq, sizediff);
dir = CTINFO2DIR(ctinfo);
this_way = &nat->seq[dir];
other_way = &nat->seq[!dir];
pr_debug("nf_nat_resize_packet: Seq_offset before: "); pr_debug("adjust_tcp_sequence: Seq_offset before: ");
DUMP_OFFSET(this_way); DUMP_OFFSET(this_way);
spin_lock_bh(&nf_nat_seqofs_lock); spin_lock_bh(&nf_nat_seqofs_lock);
...@@ -63,13 +59,13 @@ adjust_tcp_sequence(u32 seq, ...@@ -63,13 +59,13 @@ adjust_tcp_sequence(u32 seq,
* retransmit */ * retransmit */
if (this_way->offset_before == this_way->offset_after || if (this_way->offset_before == this_way->offset_after ||
before(this_way->correction_pos, seq)) { before(this_way->correction_pos, seq)) {
this_way->correction_pos = seq; this_way->correction_pos = seq;
this_way->offset_before = this_way->offset_after; this_way->offset_before = this_way->offset_after;
this_way->offset_after += sizediff; this_way->offset_after += sizediff;
} }
spin_unlock_bh(&nf_nat_seqofs_lock); spin_unlock_bh(&nf_nat_seqofs_lock);
pr_debug("nf_nat_resize_packet: Seq_offset after: "); pr_debug("adjust_tcp_sequence: Seq_offset after: ");
DUMP_OFFSET(this_way); DUMP_OFFSET(this_way);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment