diff options
| author | Vasily Averin <vvs@virtuozzo.com> | 2019-07-18 07:26:46 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-21 13:31:14 -0700 |
| commit | 903e9d1bffb557220af276eda97b9d6b103ec9e0 (patch) | |
| tree | 801e52fcd2d9123e4c5a55caa6f77cab3172e71c | |
| parent | 93428c582604f5d548afa885e72acaa16f03cc8d (diff) | |
| download | linux-903e9d1bffb557220af276eda97b9d6b103ec9e0.tar.bz2 | |
connector: remove redundant input callback from cn_dev
A small cleanup: this callback is never used.
Originally fixed by Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
for OpenVZ7 bug OVZ-6877
cc: stanislav.kinsburskiy@gmail.com
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/connector/connector.c | 6 | ||||
| -rw-r--r-- | include/linux/connector.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 23553ed6b548..2d22d6bf52f2 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c @@ -248,16 +248,12 @@ static int __maybe_unused cn_proc_show(struct seq_file *m, void *v) return 0; } -static struct cn_dev cdev = { - .input = cn_rx_skb, -}; - static int cn_init(void) { struct cn_dev *dev = &cdev; struct netlink_kernel_cfg cfg = { .groups = CN_NETLINK_USERS + 0xf, - .input = dev->input, + .input = cn_rx_skb, }; dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, &cfg); diff --git a/include/linux/connector.h b/include/linux/connector.h index 6b6c7396a584..cb732643471b 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h @@ -50,7 +50,6 @@ struct cn_dev { u32 seq, groups; struct sock *nls; - void (*input) (struct sk_buff *skb); struct cn_queue_dev *cbdev; }; |