Skip to content

Commit

Permalink
netfilter: nf_nat_helper: tidy up adjust_tcp_sequence
Browse files Browse the repository at this point in the history
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: Hannes Eder <heder@google.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
  • Loading branch information
Hannes Eder authored and Patrick McHardy committed Nov 5, 2009
1 parent 5ae27aa commit 76ac894
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions net/ipv4/netfilter/nf_nat_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,14 @@ adjust_tcp_sequence(u32 seq,
struct nf_conn *ct,
enum ip_conntrack_info ctinfo)
{
int dir;
struct nf_nat_seq *this_way, *other_way;
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
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);

dir = CTINFO2DIR(ctinfo);

this_way = &nat->seq[dir];
other_way = &nat->seq[!dir];
pr_debug("adjust_tcp_sequence: seq = %u, sizediff = %d\n",
seq, sizediff);

pr_debug("nf_nat_resize_packet: Seq_offset before: ");
pr_debug("adjust_tcp_sequence: Seq_offset before: ");
DUMP_OFFSET(this_way);

spin_lock_bh(&nf_nat_seqofs_lock);
Expand All @@ -63,13 +59,13 @@ adjust_tcp_sequence(u32 seq,
* retransmit */
if (this_way->offset_before == this_way->offset_after ||
before(this_way->correction_pos, seq)) {
this_way->correction_pos = seq;
this_way->offset_before = this_way->offset_after;
this_way->offset_after += sizediff;
this_way->correction_pos = seq;
this_way->offset_before = this_way->offset_after;
this_way->offset_after += sizediff;
}
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);
}

Expand Down

0 comments on commit 76ac894

Please sign in to comment.