xfrm: take net hdr len into account for esp payload size calculation
authorBenjamin Poirier <bpoirier@suse.de>
Thu, 24 May 2012 11:32:38 +0000 (11:32 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Jun 2012 15:36:15 +0000 (00:36 +0900)
commit978041f2a946a4616f7cdb60f6d453ffa83298c1
treee5ced0504c3986e77add058bf1923cfe7b7449b2
parent010589e2bce841733dc989fd56c5c3aba41a759c
xfrm: take net hdr len into account for esp payload size calculation

[ Upstream commit 91657eafb64b4cb53ec3a2fbc4afc3497f735788 ]

Corrects the function that determines the esp payload size. The calculations
done in esp{4,6}_get_mtu() lead to overlength frames in transport mode for
certain mtu values and suboptimal frames for others.

According to what is done, mainly in esp{,6}_output() and tcp_mtu_to_mss(),
net_header_len must be taken into account before doing the alignment
calculation.

Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/esp4.c
net/ipv6/esp6.c