summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMartin Varghese <martin.varghese@nokia.com>2020-07-17 08:05:12 +0530
committerDavid S. Miller <davem@davemloft.net>2020-07-21 18:30:47 -0700
commit4787dd582dbde0b7f29eb3dbe59df3da1b350925 (patch)
treefaa08fb5ebd28a0654b679cc13f7dcd6d68fa95e /include
parent4303aa98c2b19c533f5d3713a8ced42edb9961ea (diff)
bareudp: Reverted support to enable & disable rx metadata collection
The commit fe80536acf83 ("bareudp: Added attribute to enable & disable rx metadata collection") breaks the the original(5.7) default behavior of bareudp module to collect RX metadadata at the receive. It was added to avoid the crash at the kernel neighbour subsytem when packet with metadata from bareudp is processed. But it is no more needed as the commit 394de110a733 ("net: Added pointer check for dst->ops->neigh_lookup in dst_neigh_lookup_skb") solves this crash. Fixes: fe80536acf83 ("bareudp: Added attribute to enable & disable rx metadata collection") Signed-off-by: Martin Varghese <martin.varghese@nokia.com> Acked-by: Guillaume Nault <gnault@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/bareudp.h1
-rw-r--r--include/uapi/linux/if_link.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/net/bareudp.h b/include/net/bareudp.h
index 3dd5f9a8d01c..dc65a0d71d9b 100644
--- a/include/net/bareudp.h
+++ b/include/net/bareudp.h
@@ -12,7 +12,6 @@ struct bareudp_conf {
__be16 port;
u16 sport_min;
bool multi_proto_mode;
- bool rx_collect_metadata;
};
struct net_device *bareudp_dev_create(struct net *net, const char *name,
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 26842ffd0501..af8f31987526 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -601,7 +601,6 @@ enum {
IFLA_BAREUDP_ETHERTYPE,
IFLA_BAREUDP_SRCPORT_MIN,
IFLA_BAREUDP_MULTIPROTO_MODE,
- IFLA_BAREUDP_RX_COLLECT_METADATA,
__IFLA_BAREUDP_MAX
};