1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index cf9d718c731c..ddd2ca27e003 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -647,7 +647,6 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
         u64 wwnn, wwpn;
         struct fcoe_interface *fcoe;
         struct fcoe_port *port;
-        int vid = 0;
 
         /* Setup lport private data to point to fcoe softc */
         port = lport_priv(lport);
@@ -677,20 +676,12 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
         fcoe_link_speed_update(lport);
 
         if (!lport->vport) {
-                /*
-                 * Use NAA 1&2 (FC-FS Rev. 2.0, Sec. 15) to generate WWNN/WWPN:
-                 * For WWNN, we use NAA 1 w/ bit 27-16 of word 0 as 0.
-                 * For WWPN, we use NAA 2 w/ bit 27-16 of word 0 from VLAN ID
-                 */
-                if (netdev->priv_flags & IFF_802_1Q_VLAN)
-                        vid = vlan_dev_vlan_id(netdev);
-
                 if (fcoe_get_wwn(netdev, &wwnn, NETDEV_FCOE_WWNN))
                         wwnn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr, 1, 0);
                 fc_set_wwnn(lport, wwnn);
                 if (fcoe_get_wwn(netdev, &wwpn, NETDEV_FCOE_WWPN))
                         wwpn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr,
-                                                 2, vid);
+                                                 2, 0);
                 fc_set_wwpn(lport, wwpn);
         }