A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-06 03:45:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "can: dev: Move device back to init netns on owning netns delete"

Browse source 
This reverts commit f866d1fa48 which is
commit 3a5ca857079ea022e0b1b17fc154f7ad7dbc150f upstream.

It breaks the networking api and we do not care about CAN devices in
Android systems at this point in time.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5d5de8fccb077249478b7d1e136f91d6be0b20cd
This commit is contained in:
Greg Kroah-Hartman 2021-04-01 18:49:36 +02:00
commit b613c10dc2
3 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/can/dev.c
View file

@ -1226,7 +1226,6 @@ static void can_dellink(struct net_device *dev, struct list_head *head)
static struct rtnl_link_ops can_link_ops __read_mostly = {
.kind = "can",
.netns_refund = true,
.maxtype = IFLA_CAN_MAX,
.policy = can_policy,
.setup = can_setup,

2
include/net/rtnetlink.h
View file

@ -33,7 +33,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
*
* @list: Used internally
* @kind: Identifier
* @netns_refund: Physical device, move to init_net on netns exit
* @maxtype: Highest device specific netlink attribute number
* @policy: Netlink policy for device specific attribute validation
* @validate: Optional validation function for netlink/changelink parameters
@ -65,7 +64,6 @@ struct rtnl_link_ops {
size_t priv_size;
void (*setup)(struct net_device *dev);
bool netns_refund;
unsigned int maxtype;
const struct nla_policy *policy;
int (*validate)(struct nlattr *tb[],

2
net/core/dev.c
View file

@ -10128,7 +10128,7 @@ static void __net_exit default_device_exit(struct net *net)
continue;
/* Leave virtual devices for the generic cleanup */
if (dev->rtnl_link_ops && !dev->rtnl_link_ops->netns_refund)
if (dev->rtnl_link_ops)
continue;
/* Push remaining network devices to init_net */