Merge tag 'core-rcu-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / net / dsa / tag_rtl4_a.c

diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c
index 7b63010..2646abe 100644 (file)
--- a/net/dsa/tag_rtl4_a.c
+++ b/net/dsa/tag_rtl4_a.c
@@ -106,22 +106,11 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,
        return skb;
 }
 
-static int rtl4a_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                                 int *offset)
-{
-       *offset = RTL4_A_HDR_LEN;
-       /* Skip past the tag and fetch the encapsulated Ethertype */
-       *proto = ((__be16 *)skb->data)[1];
-
-       return 0;
-}
-
 static const struct dsa_device_ops rtl4a_netdev_ops = {
        .name   = "rtl4a",
        .proto  = DSA_TAG_PROTO_RTL4_A,
        .xmit   = rtl4a_tag_xmit,
        .rcv    = rtl4a_tag_rcv,
-       .flow_dissect = rtl4a_tag_flow_dissect,
        .overhead = RTL4_A_HDR_LEN,
 };
 module_dsa_tag_driver(rtl4a_netdev_ops);