diff options
| author | Michael Brown | 2007-09-13 15:43:12 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-09-13 15:43:12 +0200 |
| commit | 30a19c3f1c51ff404d8de3196c4355fba3083c8e (patch) | |
| tree | 013ebc0cb2c2249f9e0e0f6ea9740f97a4f89705 /src/drivers | |
| parent | Dump received packet, including GRH. (diff) | |
| download | ipxe-30a19c3f1c51ff404d8de3196c4355fba3083c8e.tar.gz ipxe-30a19c3f1c51ff404d8de3196c4355fba3083c8e.tar.xz ipxe-30a19c3f1c51ff404d8de3196c4355fba3083c8e.zip | |
Can now both send and receive packets. LL header format not yet
fixed; still using a quick hack-up just to be able to pass through
data.
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/net/mlx_ipoib/ib_mt25218.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/mlx_ipoib/mt25218.c | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/drivers/net/mlx_ipoib/ib_mt25218.c b/src/drivers/net/mlx_ipoib/ib_mt25218.c index 631a95cba..dcd49e45d 100644 --- a/src/drivers/net/mlx_ipoib/ib_mt25218.c +++ b/src/drivers/net/mlx_ipoib/ib_mt25218.c @@ -1587,12 +1587,14 @@ static void prep_send_wqe_buf(void *qph, } snd_wqe->mpointer[0].byte_count = cpu_to_be32(len); +#if 0 DBG ( "prep_send_wqe_buf()\n" ); DBG ( "snd_wqe:\n" ); DBG_HD ( snd_wqe, sizeof ( *snd_wqe ) ); DBG ( "packet:\n" ); DBG_HD ( bus_to_virt(be32_to_cpu(snd_wqe->mpointer[0].local_addr_l)), len ); +#endif } static void *alloc_ud_av(void) diff --git a/src/drivers/net/mlx_ipoib/mt25218.c b/src/drivers/net/mlx_ipoib/mt25218.c index de91dac65..a468f160e 100644 --- a/src/drivers/net/mlx_ipoib/mt25218.c +++ b/src/drivers/net/mlx_ipoib/mt25218.c @@ -248,13 +248,13 @@ static void mlx_poll ( struct net_device *netdev ) { } buf = get_rcv_wqe_buf(ib_cqe.wqe, 1); memcpy ( iob_put ( iobuf, len ), buf, len ); - DBG ( "Received packet header:\n" ); - struct recv_wqe_st *rcv_wqe = ib_cqe.wqe; - DBG_HD ( get_rcv_wqe_buf(ib_cqe.wqe, 0), - be32_to_cpu(rcv_wqe->mpointer[0].byte_count) ); + // DBG ( "Received packet header:\n" ); + // struct recv_wqe_st *rcv_wqe = ib_cqe.wqe; + // DBG_HD ( get_rcv_wqe_buf(ib_cqe.wqe, 0), + // be32_to_cpu(rcv_wqe->mpointer[0].byte_count) ); - DBG ( "Received packet:\n" ); - DBG_HD ( iobuf->data, iob_len ( iobuf ) ); + // DBG ( "Received packet:\n" ); + // DBG_HD ( iobuf->data, iob_len ( iobuf ) ); netdev_rx ( netdev, iobuf ); @@ -392,6 +392,7 @@ static int mlx_probe ( struct pci_device *pci, const struct pci_device_id *id __unused ) { struct net_device *netdev; struct mlx_nic *mlx; + struct ib_mac *mac; int rc; /* Allocate net device */ @@ -410,7 +411,9 @@ static int mlx_probe ( struct pci_device *pci, /* Initialise hardware */ if ( ( rc = ipoib_init ( pci ) ) != 0 ) goto err_ipoib_init; - memcpy ( netdev->ll_addr, ipoib_data.port_gid_raw, IB_ALEN ); + mac = ( ( struct ib_mac * ) netdev->ll_addr ); + mac->qpn = htonl ( ipoib_data.ipoib_qpn ); + memcpy ( &mac->gid, ipoib_data.port_gid_raw, sizeof ( mac->gid ) ); /* Register network device */ if ( ( rc = register_netdev ( netdev ) ) != 0 ) |