mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-06 11:54:14 -04:00
Revert "net: rtnetlink: add bulk delete support flag"
This reverts commit 2b0d1dc340 which is
commit a6cec0bcd34264be8887791594be793b3f12719f upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I8cc1e6be45fdc9d34a8cd5972d5e3a16a94a9825
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
parent
49a5ba893c
commit
fc27935e9f
2 changed files with 1 additions and 10 deletions
|
|
@ -10,8 +10,7 @@ typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *,
|
|||
typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
|
||||
|
||||
enum rtnl_link_flags {
|
||||
RTNL_FLAG_DOIT_UNLOCKED = BIT(0),
|
||||
RTNL_FLAG_BULK_DEL_SUPPORTED = BIT(1),
|
||||
RTNL_FLAG_DOIT_UNLOCKED = BIT(0),
|
||||
};
|
||||
|
||||
enum rtnl_kinds {
|
||||
|
|
|
|||
|
|
@ -214,8 +214,6 @@ static int rtnl_register_internal(struct module *owner,
|
|||
if (dumpit)
|
||||
link->dumpit = dumpit;
|
||||
|
||||
WARN_ON(rtnl_msgtype_kind(msgtype) != RTNL_KIND_DEL &&
|
||||
(flags & RTNL_FLAG_BULK_DEL_SUPPORTED));
|
||||
link->flags |= flags;
|
||||
|
||||
/* publish protocol:msgtype */
|
||||
|
|
@ -5276,12 +5274,6 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
|
|||
}
|
||||
|
||||
flags = link->flags;
|
||||
if (kind == RTNL_KIND_DEL && (nlh->nlmsg_flags & NLM_F_BULK) &&
|
||||
!(flags & RTNL_FLAG_BULK_DEL_SUPPORTED)) {
|
||||
NL_SET_ERR_MSG(extack, "Bulk delete is not supported");
|
||||
goto err_unlock;
|
||||
}
|
||||
|
||||
if (flags & RTNL_FLAG_DOIT_UNLOCKED) {
|
||||
doit = link->doit;
|
||||
rcu_read_unlock();
|
||||
|
|
|
|||
Loading…
Reference in a new issue