forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376 
 kernel/net/8021q/vlan_dev.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /* -*- linux-c -*-
23  * INET		802.1Q VLAN
34  *		Ethernet-type device handling.
....@@ -12,12 +13,6 @@
1213  *              Oct 20, 2001:  Ard van Breeman:
1314  *                - Fix MC-list, finally.
1415  *                - Flush MC-list on VLAN destroy.
15
- *
16
- *
17
- *		This program is free software; you can redistribute it and/or
18
- *		modify it under the terms of the GNU General Public License
19
- *		as published by the Free Software Foundation; either version
20
- *		2 of the License, or (at your option) any later version.
2116  */
2217 
2318 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
....@@ -31,7 +26,6 @@
3126 #include <linux/ethtool.h>
3227 #include <linux/phy.h>
3328 #include <net/arp.h>
34
-#include <net/switchdev.h>
3529 
3630 #include "vlan.h"
3731 #include "vlanproc.h"
....@@ -94,12 +88,11 @@
9488 static inline netdev_tx_t vlan_netpoll_send_skb(struct vlan_dev_priv *vlan, struct sk_buff *skb)
9589 {
9690 #ifdef CONFIG_NET_POLL_CONTROLLER
97
-	if (vlan->netpoll)
98
-		netpoll_send_skb(vlan->netpoll, skb);
91
+	return netpoll_send_skb(vlan->netpoll, skb);
9992 #else
10093 	BUG();
101
-#endif
10294 	return NETDEV_TX_OK;
95
+#endif
10396 }
10497 
10598 static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
....@@ -224,7 +217,8 @@
224217 	u32 old_flags = vlan->flags;
225218 
226219 	if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
227
-		     VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP))
220
+		     VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP |
221
+		     VLAN_FLAG_BRIDGE_BINDING))
228222 		return -EINVAL;
229223 
230224 	vlan->flags = (old_flags & ~mask) | (flags & mask);
....@@ -297,7 +291,8 @@
297291 	if (vlan->flags & VLAN_FLAG_MVRP)
298292 		vlan_mvrp_request_join(dev);
299293 
300
-	if (netif_carrier_ok(real_dev))
294
+	if (netif_carrier_ok(real_dev) &&
295
+	    !(vlan->flags & VLAN_FLAG_BRIDGE_BINDING))
301296 		netif_carrier_on(dev);
302297 	return 0;
303298 
....@@ -327,7 +322,8 @@
327322 	if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
328323 		dev_uc_del(real_dev, dev->dev_addr);
329324 
330
-	netif_carrier_off(dev);
325
+	if (!(vlan->flags & VLAN_FLAG_BRIDGE_BINDING))
326
+		netif_carrier_off(dev);
331327 	return 0;
332328 }
333329 
....@@ -371,6 +367,7 @@
371367 	case SIOCSHWTSTAMP:
372368 		if (!net_eq(dev_net(dev), &init_net))
373369 			break;
370
+		fallthrough;
374371 	case SIOCGMIIPHY:
375372 	case SIOCGMIIREG:
376373 	case SIOCSMIIREG:
....@@ -446,17 +443,6 @@
446443 	return rc;
447444 }
448445 
449
-static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
450
-{
451
-	struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
452
-	const struct net_device_ops *ops = real_dev->netdev_ops;
453
-	int rc = -EINVAL;
454
-
455
-	if (ops->ndo_fcoe_get_wwn)
456
-		rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
457
-	return rc;
458
-}
459
-
460446 static int vlan_dev_fcoe_ddp_target(struct net_device *dev, u16 xid,
461447 				    struct scatterlist *sgl, unsigned int sgc)
462448 {
....@@ -467,6 +453,19 @@
467453 	if (ops->ndo_fcoe_ddp_target)
468454 		rc = ops->ndo_fcoe_ddp_target(real_dev, xid, sgl, sgc);
469455 
456
+	return rc;
457
+}
458
+#endif
459
+
460
+#ifdef NETDEV_FCOE_WWNN
461
+static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
462
+{
463
+	struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
464
+	const struct net_device_ops *ops = real_dev->netdev_ops;
465
+	int rc = -EINVAL;
466
+
467
+	if (ops->ndo_fcoe_get_wwn)
468
+		rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
470469 	return rc;
471470 }
472471 #endif
....@@ -499,24 +498,16 @@
499498 
500499 static void vlan_dev_set_lockdep_one(struct net_device *dev,
501500 				     struct netdev_queue *txq,
502
-				     void *_subclass)
501
+				     void *unused)
503502 {
504
-	lockdep_set_class_and_subclass(&txq->_xmit_lock,
505
-				       &vlan_netdev_xmit_lock_key,
506
-				       *(int *)_subclass);
503
+	lockdep_set_class(&txq->_xmit_lock, &vlan_netdev_xmit_lock_key);
507504 }
508505 
509
-static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)
506
+static void vlan_dev_set_lockdep_class(struct net_device *dev)
510507 {
511
-	lockdep_set_class_and_subclass(&dev->addr_list_lock,
512
-				       &vlan_netdev_addr_lock_key,
513
-				       subclass);
514
-	netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass);
515
-}
516
-
517
-static int vlan_dev_get_lock_subclass(struct net_device *dev)
518
-{
519
-	return vlan_dev_priv(dev)->nest_level;
508
+	lockdep_set_class(&dev->addr_list_lock,
509
+			  &vlan_netdev_addr_lock_key);
510
+	netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, NULL);
520511 }
521512 
522513 static const struct header_ops vlan_header_ops = {
....@@ -551,7 +542,8 @@
551542 
552543 static int vlan_dev_init(struct net_device *dev)
553544 {
554
-	struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
545
+	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
546
+	struct net_device *real_dev = vlan->real_dev;
555547 
556548 	netif_carrier_off(dev);
557549 
....@@ -562,8 +554,12 @@
562554 					  (1<<__LINK_STATE_DORMANT))) |
563555 		      (1<<__LINK_STATE_PRESENT);
564556 
557
+	if (vlan->flags & VLAN_FLAG_BRIDGE_BINDING)
558
+		dev->state |= (1 << __LINK_STATE_NOCARRIER);
559
+
565560 	dev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG |
566561 			   NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE |
562
+			   NETIF_F_GSO_ENCAP_ALL |
567563 			   NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
568564 			   NETIF_F_ALL_FCOE;
569565 
....@@ -574,6 +570,8 @@
574570 		netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");
575571 
576572 	dev->vlan_features = real_dev->vlan_features & ~NETIF_F_ALL_FCOE;
573
+	dev->hw_enc_features = vlan_tnl_features(real_dev);
574
+	dev->mpls_features = real_dev->mpls_features;
577575 
578576 	/* ipv6 shared card related stuff */
579577 	dev->dev_id = real_dev->dev_id;
....@@ -590,8 +588,7 @@
590588 #endif
591589 
592590 	dev->needed_headroom = real_dev->needed_headroom;
593
-	if (vlan_hw_offload_capable(real_dev->features,
594
-				    vlan_dev_priv(dev)->vlan_proto)) {
591
+	if (vlan_hw_offload_capable(real_dev->features, vlan->vlan_proto)) {
595592 		dev->header_ops      = &vlan_passthru_header_ops;
596593 		dev->hard_header_len = real_dev->hard_header_len;
597594 	} else {
....@@ -603,11 +600,14 @@
603600 
604601 	SET_NETDEV_DEVTYPE(dev, &vlan_type);
605602 
606
-	vlan_dev_set_lockdep_class(dev, vlan_dev_get_lock_subclass(dev));
603
+	vlan_dev_set_lockdep_class(dev);
607604 
608
-	vlan_dev_priv(dev)->vlan_pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);
609
-	if (!vlan_dev_priv(dev)->vlan_pcpu_stats)
605
+	vlan->vlan_pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);
606
+	if (!vlan->vlan_pcpu_stats)
610607 		return -ENOMEM;
608
+
609
+	/* Get vlan's reference to real_dev */
610
+	dev_hold(real_dev);
611611 
612612 	return 0;
613613 }
....@@ -673,8 +673,8 @@
673673 	const struct ethtool_ops *ops = vlan->real_dev->ethtool_ops;
674674 	struct phy_device *phydev = vlan->real_dev->phydev;
675675 
676
-	if (phydev && phydev->drv && phydev->drv->ts_info) {
677
-		 return phydev->drv->ts_info(phydev, info);
676
+	if (phy_has_tsinfo(phydev)) {
677
+		return phy_ts_info(phydev, info);
678678 	} else if (ops->get_ts_info) {
679679 		return ops->get_ts_info(vlan->real_dev, info);
680680 	} else {
....@@ -759,8 +759,7 @@
759759 		return;
760760 
761761 	vlan->netpoll = NULL;
762
-
763
-	__netpoll_free_async(netpoll);
762
+	__netpoll_free(netpoll);
764763 }
765764 #endif /* CONFIG_NET_POLL_CONTROLLER */
766765 
....@@ -797,8 +796,10 @@
797796 	.ndo_fcoe_ddp_done	= vlan_dev_fcoe_ddp_done,
798797 	.ndo_fcoe_enable	= vlan_dev_fcoe_enable,
799798 	.ndo_fcoe_disable	= vlan_dev_fcoe_disable,
800
-	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,
801799 	.ndo_fcoe_ddp_target	= vlan_dev_fcoe_ddp_target,
800
+#endif
801
+#ifdef NETDEV_FCOE_WWNN
802
+	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,
802803 #endif
803804 #ifdef CONFIG_NET_POLL_CONTROLLER
804805 	.ndo_poll_controller	= vlan_dev_poll_controller,
....@@ -806,7 +807,6 @@
806807 	.ndo_netpoll_cleanup	= vlan_dev_netpoll_cleanup,
807808 #endif
808809 	.ndo_fix_features	= vlan_dev_fix_features,
809
-	.ndo_get_lock_subclass  = vlan_dev_get_lock_subclass,
810810 	.ndo_get_iflink		= vlan_dev_get_iflink,
811811 };
812812 
....@@ -816,6 +816,9 @@
816816 
817817 	free_percpu(vlan->vlan_pcpu_stats);
818818 	vlan->vlan_pcpu_stats = NULL;
819
+
820
+	/* Get rid of the vlan's reference to real_dev */
821
+	dev_put(vlan->real_dev);
819822 }
820823 
821824 void vlan_setup(struct net_device *dev)