RDMA/rxe: Consider skb reserve space based on netdev of GID

Always consider the skb reserve space based on netdevice of the GID
attribute, regardless of vlan or non vlan netdevice.

Fixes: 43c9fc509fa5 ("rdma_rxe: make rxe work over 802.1q VLAN devices")
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index f186b92ba45b71a750d458fda7df53e6b53566b2..c44139788afcea4f71a8995d278ffd6c35e8ac48 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -481,8 +481,9 @@ struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
        if (unlikely(!skb))
                goto out;
 
-       skb_reserve(skb, hdr_len + LL_RESERVED_SPACE(rxe->ndev));
+       skb_reserve(skb, hdr_len + LL_RESERVED_SPACE(ndev));
 
+       /* FIXME: hold reference to this netdev until life of this skb. */
        skb->dev        = ndev;
        if (av->network_type == RDMA_NETWORK_IPV4)
                skb->protocol = htons(ETH_P_IP);