[NET] IPV4: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
642656518b
commit
e905a9edab
@@ -22,7 +22,7 @@
|
||||
* Fixes:
|
||||
* Alan Cox : Missing nonblock feature in ip_build_xmit.
|
||||
* Mike Kilburn : htons() missing in ip_build_xmit.
|
||||
* Bradford Johnson: Fix faulty handling of some frames when
|
||||
* Bradford Johnson: Fix faulty handling of some frames when
|
||||
* no route is found.
|
||||
* Alexander Demenshin: Missing sk/skb free in ip_queue_xmit
|
||||
* (in case if packet not accepted by
|
||||
@@ -33,9 +33,9 @@
|
||||
* some redundant tests.
|
||||
* Vitaly E. Lavrov : Transparent proxy revived after year coma.
|
||||
* Andi Kleen : Replace ip_reply with ip_send_reply.
|
||||
* Andi Kleen : Split fast and slow ip_build_xmit path
|
||||
* for decreased register pressure on x86
|
||||
* and more readibility.
|
||||
* Andi Kleen : Split fast and slow ip_build_xmit path
|
||||
* for decreased register pressure on x86
|
||||
* and more readibility.
|
||||
* Marc Boucher : When call_out_firewall returns FW_QUEUE,
|
||||
* silently drop skb instead of failing with -EPERM.
|
||||
* Detlev Wengorz : Copy protocol for fragments.
|
||||
@@ -114,7 +114,7 @@ static inline int ip_select_ttl(struct inet_sock *inet, struct dst_entry *dst)
|
||||
return ttl;
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
* Add an ip header to a skbuff and send it out.
|
||||
*
|
||||
*/
|
||||
@@ -243,7 +243,7 @@ int ip_mc_output(struct sk_buff *skb)
|
||||
struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC);
|
||||
if (newskb)
|
||||
NF_HOOK(PF_INET, NF_IP_POST_ROUTING, newskb, NULL,
|
||||
newskb->dev,
|
||||
newskb->dev,
|
||||
ip_dev_loopback_xmit);
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ int ip_output(struct sk_buff *skb)
|
||||
skb->protocol = htons(ETH_P_IP);
|
||||
|
||||
return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, dev,
|
||||
ip_finish_output,
|
||||
ip_finish_output,
|
||||
!(IPCB(skb)->flags & IPSKB_REROUTED));
|
||||
}
|
||||
|
||||
@@ -660,7 +660,7 @@ slow_path:
|
||||
return err;
|
||||
|
||||
fail:
|
||||
kfree_skb(skb);
|
||||
kfree_skb(skb);
|
||||
IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
|
||||
return err;
|
||||
}
|
||||
@@ -755,7 +755,7 @@ static inline int ip_ufo_append_data(struct sock *sk,
|
||||
* from many pieces of data. Each pieces will be holded on the socket
|
||||
* until ip_push_pending_frames() is called. Each piece can be a page
|
||||
* or non-page data.
|
||||
*
|
||||
*
|
||||
* Not only UDP, other transport protocols - e.g. raw sockets - can use
|
||||
* this interface potentially.
|
||||
*
|
||||
@@ -888,7 +888,7 @@ alloc_new_skb:
|
||||
datalen = maxfraglen - fragheaderlen;
|
||||
fraglen = datalen + fragheaderlen;
|
||||
|
||||
if ((flags & MSG_MORE) &&
|
||||
if ((flags & MSG_MORE) &&
|
||||
!(rt->u.dst.dev->features&NETIF_F_SG))
|
||||
alloclen = mtu;
|
||||
else
|
||||
@@ -903,14 +903,14 @@ alloc_new_skb:
|
||||
alloclen += rt->u.dst.trailer_len;
|
||||
|
||||
if (transhdrlen) {
|
||||
skb = sock_alloc_send_skb(sk,
|
||||
skb = sock_alloc_send_skb(sk,
|
||||
alloclen + hh_len + 15,
|
||||
(flags & MSG_DONTWAIT), &err);
|
||||
} else {
|
||||
skb = NULL;
|
||||
if (atomic_read(&sk->sk_wmem_alloc) <=
|
||||
2 * sk->sk_sndbuf)
|
||||
skb = sock_wmalloc(sk,
|
||||
skb = sock_wmalloc(sk,
|
||||
alloclen + hh_len + 15, 1,
|
||||
sk->sk_allocation);
|
||||
if (unlikely(skb == NULL))
|
||||
@@ -971,7 +971,7 @@ alloc_new_skb:
|
||||
unsigned int off;
|
||||
|
||||
off = skb->len;
|
||||
if (getfrag(from, skb_put(skb, copy),
|
||||
if (getfrag(from, skb_put(skb, copy),
|
||||
offset, copy, off, skb) < 0) {
|
||||
__skb_trim(skb, off);
|
||||
err = -EFAULT;
|
||||
@@ -993,7 +993,7 @@ alloc_new_skb:
|
||||
goto error;
|
||||
}
|
||||
get_page(page);
|
||||
skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
|
||||
skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
|
||||
frag = &skb_shinfo(skb)->frags[i];
|
||||
}
|
||||
} else if (i < MAX_SKB_FRAGS) {
|
||||
@@ -1033,7 +1033,7 @@ alloc_new_skb:
|
||||
error:
|
||||
inet->cork.length -= length;
|
||||
IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
|
||||
return err;
|
||||
return err;
|
||||
}
|
||||
|
||||
ssize_t ip_append_page(struct sock *sk, struct page *page,
|
||||
@@ -1257,7 +1257,7 @@ int ip_push_pending_frames(struct sock *sk)
|
||||
skb->dst = dst_clone(&rt->u.dst);
|
||||
|
||||
/* Netfilter gets whole the not fragmented skb. */
|
||||
err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL,
|
||||
err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL,
|
||||
skb->dst->dev, dst_output);
|
||||
if (err) {
|
||||
if (err > 0)
|
||||
@@ -1305,21 +1305,21 @@ void ip_flush_pending_frames(struct sock *sk)
|
||||
/*
|
||||
* Fetch data from kernel space and fill in checksum if needed.
|
||||
*/
|
||||
static int ip_reply_glue_bits(void *dptr, char *to, int offset,
|
||||
static int ip_reply_glue_bits(void *dptr, char *to, int offset,
|
||||
int len, int odd, struct sk_buff *skb)
|
||||
{
|
||||
__wsum csum;
|
||||
|
||||
csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0);
|
||||
skb->csum = csum_block_add(skb->csum, csum, odd);
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
* Generic function to send a packet as reply to another packet.
|
||||
* Used to send TCP resets so far. ICMP should use this function too.
|
||||
*
|
||||
* Should run single threaded per socket because it uses the sock
|
||||
* Should run single threaded per socket because it uses the sock
|
||||
* structure to pass arguments.
|
||||
*
|
||||
* LATER: switch from ip_build_xmit to ip_append_*
|
||||
@@ -1357,7 +1357,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
|
||||
/* Not quite clean, but right. */
|
||||
.uli_u = { .ports =
|
||||
{ .sport = skb->h.th->dest,
|
||||
.dport = skb->h.th->source } },
|
||||
.dport = skb->h.th->source } },
|
||||
.proto = sk->sk_protocol };
|
||||
security_skb_classify_flow(skb, &fl);
|
||||
if (ip_route_output_key(&rt, &fl))
|
||||
|
Reference in New Issue
Block a user