projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv6
/
reassembly.c
diff --git
a/net/ipv6/reassembly.c
b/net/ipv6/reassembly.c
index c6557d9f7808c42e686582f31e8cc535a7067f3f..1a157ca2ebc18c5a12519adb9eacd30d508722eb 100644
(file)
--- a/
net/ipv6/reassembly.c
+++ b/
net/ipv6/reassembly.c
@@
-62,13
+62,12
@@
static const char ip6_frag_cache_name[] = "ip6-frags";
static const char ip6_frag_cache_name[] = "ip6-frags";
-struct ip6frag_skb_cb
-{
+struct ip6frag_skb_cb {
struct inet6_skb_parm h;
int offset;
};
struct inet6_skb_parm h;
int offset;
};
-#define FRAG6_CB(skb) ((struct ip6frag_skb_cb*)((skb)->cb))
+#define FRAG6_CB(skb) ((struct ip6frag_skb_cb
*)((skb)->cb))
static inline u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h)
{
static inline u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h)
{
@@
-289,7
+288,7
@@
static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
goto found;
}
prev = NULL;
goto found;
}
prev = NULL;
- for(next = fq->q.fragments; next != NULL; next = next->next) {
+ for
(next = fq->q.fragments; next != NULL; next = next->next) {
if (FRAG6_CB(next)->offset >= offset)
break; /* bingo! */
prev = next;
if (FRAG6_CB(next)->offset >= offset)
break; /* bingo! */
prev = next;
@@
-529,7
+528,7
@@
static int ipv6_frag_rcv(struct sk_buff *skb)
IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_REASMREQDS);
/* Jumbo payload inhibits frag. header */
IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_REASMREQDS);
/* Jumbo payload inhibits frag. header */
- if (hdr->payload_len
==
0)
+ if (hdr->payload_len
==
0)
goto fail_hdr;
if (!pskb_may_pull(skb, (skb_transport_offset(skb) +
goto fail_hdr;
if (!pskb_may_pull(skb, (skb_transport_offset(skb) +
@@
-575,8
+574,7
@@
fail_hdr:
return -1;
}
return -1;
}
-static const struct inet6_protocol frag_protocol =
-{
+static const struct inet6_protocol frag_protocol = {
.handler = ipv6_frag_rcv,
.flags = INET6_PROTO_NOPOLICY,
};
.handler = ipv6_frag_rcv,
.flags = INET6_PROTO_NOPOLICY,
};