summaryrefslogtreecommitdiff
path: root/drivers/net/loopback.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-10 07:31:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-10 07:31:51 +0100
commit046cc01be6b9d139b49dfc396b7201c633ff1a26 (patch)
tree529f902da1c2ef691ac83491547d816704ac1a83 /drivers/net/loopback.c
parent74fc34937d72d04e89e4f75ea66147cdc9b785f5 (diff)
parent80e54e84911a923c40d7bee33a34c1b4be148d7a (diff)
downloadlinux-next-046cc01be6b9d139b49dfc396b7201c633ff1a26.tar.gz
linux-next-046cc01be6b9d139b49dfc396b7201c633ff1a26.zip
Merge 6.14-rc6 into char-misc-next
We need the fixes in here as well to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/loopback.c')
-rw-r--r--drivers/net/loopback.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index c8840c3b9a1b..f1d68153987e 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -244,8 +244,22 @@ static netdev_tx_t blackhole_netdev_xmit(struct sk_buff *skb,
return NETDEV_TX_OK;
}
+static int blackhole_neigh_output(struct neighbour *n, struct sk_buff *skb)
+{
+ kfree_skb(skb);
+ return 0;
+}
+
+static int blackhole_neigh_construct(struct net_device *dev,
+ struct neighbour *n)
+{
+ n->output = blackhole_neigh_output;
+ return 0;
+}
+
static const struct net_device_ops blackhole_netdev_ops = {
.ndo_start_xmit = blackhole_netdev_xmit,
+ .ndo_neigh_construct = blackhole_neigh_construct,
};
/* This is a dst-dummy device used specifically for invalidated