]> git.baikalelectronics.ru Git - kernel.git/commitdiff
cxgb4: use dev_port to identify ports
authorThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Sat, 21 Jun 2014 12:48:08 +0000 (09:48 -0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Jun 2014 23:01:54 +0000 (16:01 -0700)
Commit c71abc442cf3e793781cf25d221c3c9e690640bc ("net: Add sysfs file
for port number") introduce dev_port to network devices. cxgb4 adapters
have multiple ports on the same PCI function, and used dev_id to
identify those ports. That use was removed by commit
3de857a0efb514606243c7684e629d1aa704e517 ("cxgb4: Do not set
net_device::dev_id to VI index"), since dev_id should be used only when
devices share the same MAC address.

Using dev_port for cxgb4 allows different ports on the same PCI function
to be identified.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

index bba67681aeaaae90fa8cc8f41ac3b5d70341e227..931478e7bd284e9b21791ada6a172ea2f9c00e40 100644 (file)
@@ -3962,6 +3962,7 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
                p->lport = j;
                p->rss_size = rss_size;
                memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
+               adap->port[i]->dev_port = j;
 
                ret = ntohl(c.u.info.lstatus_to_modtype);
                p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP) ?