Revert "ipv6: fix ndisc_is_useropt() handling for PIO"
This reverts commit 254636f1d3
.
This commit is contained in:
parent
6e343e2374
commit
91e81d11cd
1 changed files with 16 additions and 18 deletions
|
@ -226,7 +226,6 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
|
|||
return NULL;
|
||||
memset(ndopts, 0, sizeof(*ndopts));
|
||||
while (opt_len) {
|
||||
bool unknown = false;
|
||||
int l;
|
||||
if (opt_len < sizeof(struct nd_opt_hdr))
|
||||
return NULL;
|
||||
|
@ -262,23 +261,22 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
|
|||
break;
|
||||
#endif
|
||||
default:
|
||||
unknown = true;
|
||||
}
|
||||
if (ndisc_is_useropt(dev, nd_opt)) {
|
||||
ndopts->nd_useropts_end = nd_opt;
|
||||
if (!ndopts->nd_useropts)
|
||||
ndopts->nd_useropts = nd_opt;
|
||||
} else if (unknown) {
|
||||
/*
|
||||
* Unknown options must be silently ignored,
|
||||
* to accommodate future extension to the
|
||||
* protocol.
|
||||
*/
|
||||
ND_PRINTK(2, notice,
|
||||
"%s: ignored unsupported option; type=%d, len=%d\n",
|
||||
__func__,
|
||||
nd_opt->nd_opt_type,
|
||||
nd_opt->nd_opt_len);
|
||||
if (ndisc_is_useropt(dev, nd_opt)) {
|
||||
ndopts->nd_useropts_end = nd_opt;
|
||||
if (!ndopts->nd_useropts)
|
||||
ndopts->nd_useropts = nd_opt;
|
||||
} else {
|
||||
/*
|
||||
* Unknown options must be silently ignored,
|
||||
* to accommodate future extension to the
|
||||
* protocol.
|
||||
*/
|
||||
ND_PRINTK(2, notice,
|
||||
"%s: ignored unsupported option; type=%d, len=%d\n",
|
||||
__func__,
|
||||
nd_opt->nd_opt_type,
|
||||
nd_opt->nd_opt_len);
|
||||
}
|
||||
}
|
||||
next_opt:
|
||||
opt_len -= l;
|
||||
|
|
Loading…
Add table
Reference in a new issue