Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 67047
b: refs/heads/master
c: ceb1eec
h: refs/heads/master
i:
  67045: 3e2bbd4
  67043: 10580bc
  67039: cb7b42b
v: v3
  • Loading branch information
Herbert Xu authored and David S. Miller committed Oct 10, 2007
1 parent 41d6a61 commit 64c70cc
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 66 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87bdc48d304191313203df9b98d783e1ab5a55ab
refs/heads/master: ceb1eec8291175686d0208e66595ff83bc0624e2
2 changes: 0 additions & 2 deletions trunk/net/ipv4/ah4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
}

ip_send_check(top_iph);

err = 0;

error:
Expand Down
7 changes: 1 addition & 6 deletions trunk/net/ipv4/esp4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
{
int err;
struct iphdr *top_iph;
struct ip_esp_hdr *esph;
struct crypto_blkcipher *tfm;
struct blkcipher_desc desc;
Expand Down Expand Up @@ -59,9 +58,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
pskb_put(skb, trailer, clen - skb->len);

skb_push(skb, -skb_network_offset(skb));
top_iph = ip_hdr(skb);
esph = ip_esp_hdr(skb);
top_iph->tot_len = htons(skb->len + alen);
*(skb_tail_pointer(trailer) - 1) = *skb_mac_header(skb);
*skb_mac_header(skb) = IPPROTO_ESP;

Expand All @@ -76,7 +73,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
uh = (struct udphdr *)esph;
uh->source = encap->encap_sport;
uh->dest = encap->encap_dport;
uh->len = htons(skb->len + alen - top_iph->ihl*4);
uh->len = htons(skb->len + alen - skb_transport_offset(skb));
uh->check = 0;

switch (encap->encap_type) {
Expand Down Expand Up @@ -136,8 +133,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
unlock:
spin_unlock_bh(&x->lock);

ip_send_check(top_iph);

error:
return err;
}
Expand Down
22 changes: 5 additions & 17 deletions trunk/net/ipv4/ipcomp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb)
static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
{
struct ipcomp_data *ipcd = x->data;
const int ihlen = skb_transport_offset(skb);
const int plen = skb->len - ihlen;
const int plen = skb->len;
int dlen = IPCOMP_SCRATCH_SIZE;
u8 *start = skb_transport_header(skb);
u8 *start = skb->data;
const int cpu = get_cpu();
u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
Expand All @@ -118,7 +117,7 @@ static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
put_cpu();

pskb_trim(skb, ihlen + dlen + sizeof(struct ip_comp_hdr));
pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr));
return 0;

out:
Expand All @@ -131,13 +130,8 @@ static int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb)
int err;
struct ip_comp_hdr *ipch;
struct ipcomp_data *ipcd = x->data;
int hdr_len = 0;
struct iphdr *iph = ip_hdr(skb);

skb_push(skb, -skb_network_offset(skb));
iph->tot_len = htons(skb->len);
hdr_len = iph->ihl * 4;
if ((skb->len - hdr_len) < ipcd->threshold) {
if (skb->len < ipcd->threshold) {
/* Don't bother compressing */
goto out_ok;
}
Expand All @@ -146,25 +140,19 @@ static int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb)
goto out_ok;

err = ipcomp_compress(x, skb);
iph = ip_hdr(skb);

if (err) {
goto out_ok;
}

/* Install ipcomp header, convert into ipcomp datagram. */
iph->tot_len = htons(skb->len);
ipch = ip_comp_hdr(skb);
ipch->nexthdr = *skb_mac_header(skb);
ipch->flags = 0;
ipch->cpi = htons((u16 )ntohl(x->id.spi));
*skb_mac_header(skb) = IPPROTO_COMP;
ip_send_check(iph);
return 0;

out_ok:
if (x->props.mode == XFRM_MODE_TUNNEL)
ip_send_check(iph);
skb_push(skb, -skb_network_offset(skb));
return 0;
}

Expand Down
3 changes: 0 additions & 3 deletions trunk/net/ipv4/xfrm4_mode_beet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
/* Add encapsulation header.
*
* The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt.
* The following fields in it shall be filled in by x->type->output:
* tot_len
* check
*/
static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
{
Expand Down
5 changes: 1 addition & 4 deletions trunk/net/ipv4/xfrm4_mode_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ static inline void ipip6_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb)

/* Add encapsulation header.
*
* The top IP header will be constructed per RFC 2401. The following fields
* in it shall be filled in by x->type->output:
* tot_len
* check
* The top IP header will be constructed per RFC 2401.
*/
static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
{
Expand Down
5 changes: 5 additions & 0 deletions trunk/net/ipv4/xfrm4_output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ static inline int xfrm4_output_one(struct sk_buff *skb)
{
struct dst_entry *dst = skb->dst;
struct xfrm_state *x = dst->xfrm;
struct iphdr *iph;
int err;

if (x->props.mode == XFRM_MODE_TUNNEL) {
Expand All @@ -56,6 +57,10 @@ static inline int xfrm4_output_one(struct sk_buff *skb)
if (err)
goto error_nolock;

iph = ip_hdr(skb);
iph->tot_len = htons(skb->len);
ip_send_check(iph);

IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
err = 0;

Expand Down
5 changes: 0 additions & 5 deletions trunk/net/ipv4/xfrm4_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@

static int ipip_output(struct xfrm_state *x, struct sk_buff *skb)
{
struct iphdr *iph = ip_hdr(skb);

skb_push(skb, -skb_network_offset(skb));
iph->tot_len = htons(skb->len);
ip_send_check(iph);

return 0;
}

Expand Down
3 changes: 0 additions & 3 deletions trunk/net/ipv6/esp6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
{
int err;
struct ipv6hdr *top_iph;
struct ip_esp_hdr *esph;
struct crypto_blkcipher *tfm;
struct blkcipher_desc desc;
Expand Down Expand Up @@ -85,9 +84,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
pskb_put(skb, trailer, clen - skb->len);

skb_push(skb, -skb_network_offset(skb));
top_iph = ipv6_hdr(skb);
esph = ip_esp_hdr(skb);
top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph));
*(skb_tail_pointer(trailer) - 1) = *skb_mac_header(skb);
*skb_mac_header(skb) = IPPROTO_ESP;

Expand Down
19 changes: 6 additions & 13 deletions trunk/net/ipv6/ipcomp6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,30 +119,25 @@ static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb)
{
int err;
struct ipv6hdr *top_iph;
struct ip_comp_hdr *ipch;
struct ipcomp_data *ipcd = x->data;
int plen, dlen;
u8 *start, *scratch;
struct crypto_comp *tfm;
int cpu;
int hdr_len;

skb_push(skb, -skb_network_offset(skb));
hdr_len = skb_transport_offset(skb);

/* check whether datagram len is larger than threshold */
if ((skb->len - hdr_len) < ipcd->threshold) {
if (skb->len < ipcd->threshold) {
goto out_ok;
}

if (skb_linearize_cow(skb))
goto out_ok;

/* compression */
plen = skb->len - hdr_len;
plen = skb->len;
dlen = IPCOMP_SCRATCH_SIZE;
start = skb_transport_header(skb);
start = skb->data;

cpu = get_cpu();
scratch = *per_cpu_ptr(ipcomp6_scratches, cpu);
Expand All @@ -155,20 +150,18 @@ static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb)
}
memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
put_cpu();
pskb_trim(skb, hdr_len + dlen + sizeof(struct ip_comp_hdr));
pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr));

/* insert ipcomp header and replace datagram */
top_iph = ipv6_hdr(skb);

top_iph->payload_len = htons(skb->len - sizeof(struct ipv6hdr));

ipch = ip_comp_hdr(skb);
ipch->nexthdr = *skb_mac_header(skb);
ipch->flags = 0;
ipch->cpi = htons((u16 )ntohl(x->id.spi));
*skb_mac_header(skb) = IPPROTO_COMP;

out_ok:
skb_push(skb, -skb_network_offset(skb));

return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions trunk/net/ipv6/mip6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ static int mip6_destopt_output(struct xfrm_state *x, struct sk_buff *skb)

skb_push(skb, -skb_network_offset(skb));
iph = ipv6_hdr(skb);
iph->payload_len = htons(skb->len - sizeof(*iph));

nexthdr = *skb_mac_header(skb);
*skb_mac_header(skb) = IPPROTO_DSTOPTS;
Expand Down Expand Up @@ -370,7 +369,6 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb)

skb_push(skb, -skb_network_offset(skb));
iph = ipv6_hdr(skb);
iph->payload_len = htons(skb->len - sizeof(*iph));

nexthdr = *skb_mac_header(skb);
*skb_mac_header(skb) = IPPROTO_ROUTING;
Expand Down
2 changes: 0 additions & 2 deletions trunk/net/ipv6/xfrm6_mode_beet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
/* Add encapsulation header.
*
* The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt.
* The following fields in it shall be filled in by x->type->output:
* payload_len
*/
static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
{
Expand Down
4 changes: 1 addition & 3 deletions trunk/net/ipv6/xfrm6_mode_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ static inline void ip6ip_ecn_decapsulate(struct sk_buff *skb)

/* Add encapsulation header.
*
* The top IP header will be constructed per RFC 2401. The following fields
* in it shall be filled in by x->type->output:
* payload_len
* The top IP header will be constructed per RFC 2401.
*/
static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
{
Expand Down
4 changes: 4 additions & 0 deletions trunk/net/ipv6/xfrm6_output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ static inline int xfrm6_output_one(struct sk_buff *skb)
{
struct dst_entry *dst = skb->dst;
struct xfrm_state *x = dst->xfrm;
struct ipv6hdr *iph;
int err;

if (x->props.mode == XFRM_MODE_TUNNEL) {
Expand All @@ -59,6 +60,9 @@ static inline int xfrm6_output_one(struct sk_buff *skb)
if (err)
goto error_nolock;

iph = ipv6_hdr(skb);
iph->payload_len = htons(skb->len - sizeof(*iph));

IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
err = 0;

Expand Down
5 changes: 0 additions & 5 deletions trunk/net/ipv6/xfrm6_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,7 @@ EXPORT_SYMBOL(xfrm6_tunnel_free_spi);

static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
{
struct ipv6hdr *top_iph;

skb_push(skb, -skb_network_offset(skb));
top_iph = ipv6_hdr(skb);
top_iph->payload_len = htons(skb->len - sizeof(struct ipv6hdr));

return 0;
}

Expand Down

0 comments on commit 64c70cc

Please sign in to comment.