From 00d7f8082786b6c84593bf885fc0b9b123c3f088 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 11 May 2015 20:03:31 +0300 Subject: [PATCH] mlx4/backport: Fixed dev_id Signed-off-by: Vladimir Sokolovsky --- patches/0003-BACKPORT-mlx4.patch | 38 +++++++++++++++++--------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/patches/0003-BACKPORT-mlx4.patch b/patches/0003-BACKPORT-mlx4.patch index 0e58a28..c9adcc8 100644 --- a/patches/0003-BACKPORT-mlx4.patch +++ b/patches/0003-BACKPORT-mlx4.patch @@ -3,21 +3,21 @@ Subject: [PATCH] BACKPORT: mlx4 Signed-off-by: Vladimir Sokolovsky --- - drivers/infiniband/hw/mlx4/cm.c | 27 +++ - drivers/infiniband/hw/mlx4/main.c | 8 + - drivers/net/ethernet/mellanox/mlx4/cmd.c | 6 + - drivers/net/ethernet/mellanox/mlx4/en_clock.c | 2 + - drivers/net/ethernet/mellanox/mlx4/en_cq.c | 11 ++ - drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 4 + - drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 62 +++++++- - drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 204 +++++++++++++++++++++++ - drivers/net/ethernet/mellanox/mlx4/en_rx.c | 84 +++++++++- - drivers/net/ethernet/mellanox/mlx4/en_tx.c | 53 ++++++- - drivers/net/ethernet/mellanox/mlx4/eq.c | 10 + - drivers/net/ethernet/mellanox/mlx4/main.c | 24 +++ - drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 21 +++- - include/linux/mlx4/cq.h | 5 + - 14 files changed, 516 insertions(+), 5 deletions(-) + drivers/infiniband/hw/mlx4/cm.c | 27 ++++ + drivers/infiniband/hw/mlx4/main.c | 8 + + drivers/net/ethernet/mellanox/mlx4/cmd.c | 6 + + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 2 + + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 11 ++ + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 62 ++++++- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 206 ++++++++++++++++++++++++ + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 84 +++++++++- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 53 +++++- + drivers/net/ethernet/mellanox/mlx4/eq.c | 10 ++ + drivers/net/ethernet/mellanox/mlx4/main.c | 24 +++ + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 21 ++- + include/linux/mlx4/cq.h | 5 + + 14 files changed, 518 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c index xxxxxxx..xxxxxxx xxxxxx @@ -896,17 +896,19 @@ index xxxxxxx..xxxxxxx xxxxxx int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, struct mlx4_en_port_profile *prof) -@@ -2447,7 +2600,9 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, +@@ -2447,7 +2600,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, netif_set_real_num_rx_queues(dev, prof->rx_ring_num); SET_NETDEV_DEV(dev, &mdev->dev->pdev->dev); +#ifdef HAVE_NET_DEVICE_DEV_PORT dev->dev_port = port - 1; ++#else ++ dev->dev_id = port - 1; +#endif /* * Initialize driver private data -@@ -2560,19 +2715,41 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, +@@ -2560,19 +2717,41 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, /* * Initialize netdev entry points */ @@ -948,7 +950,7 @@ index xxxxxxx..xxxxxxx xxxxxx dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; if (mdev->LSO_support) dev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6; -@@ -2588,9 +2765,36 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, +@@ -2588,9 +2767,36 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, if (mdev->dev->caps.steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED) dev->hw_features |= NETIF_F_NTUPLE; -- 2.46.0