projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv6: coding style: comparison for equality with NULL
[linux-2.6-block.git]
/
net
/
ipv6
/
xfrm6_policy.c
diff --git
a/net/ipv6/xfrm6_policy.c
b/net/ipv6/xfrm6_policy.c
index 48bf5a06847bd59db7834758b22aa9208d727940..91d934c22a2a103e4bb6785d7428dfcd22335d05 100644
(file)
--- a/
net/ipv6/xfrm6_policy.c
+++ b/
net/ipv6/xfrm6_policy.c
@@
-200,6
+200,7
@@
_decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
#if IS_ENABLED(CONFIG_IPV6_MIP6)
case IPPROTO_MH:
#if IS_ENABLED(CONFIG_IPV6_MIP6)
case IPPROTO_MH:
+ offset += ipv6_optlen(exthdr);
if (!onlyproto && pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
struct ip6_mh *mh;
if (!onlyproto && pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
struct ip6_mh *mh;
@@
-292,7
+293,6
@@
static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
static struct dst_ops xfrm6_dst_ops = {
.family = AF_INET6,
static struct dst_ops xfrm6_dst_ops = {
.family = AF_INET6,
- .protocol = cpu_to_be16(ETH_P_IPV6),
.gc = xfrm6_garbage_collect,
.update_pmtu = xfrm6_update_pmtu,
.redirect = xfrm6_redirect,
.gc = xfrm6_garbage_collect,
.update_pmtu = xfrm6_update_pmtu,
.redirect = xfrm6_redirect,
@@
-370,7
+370,7
@@
static void __net_exit xfrm6_net_exit(struct net *net)
{
struct ctl_table *table;
{
struct ctl_table *table;
- if (
net->ipv6.sysctl.xfrm6_hdr == NULL
)
+ if (
!net->ipv6.sysctl.xfrm6_hdr
)
return;
table = net->ipv6.sysctl.xfrm6_hdr->ctl_table_arg;
return;
table = net->ipv6.sysctl.xfrm6_hdr->ctl_table_arg;