Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[karo-tx-linux.git] / drivers / infiniband / ulp / opa_vnic / opa_vnic_netdev.c

diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
index 1a89c603335832905da722278bcab72e1d14e56d..1a3c25364b645e971d307763454ce17ffa1da2d4 100644 (file)
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
@@ -103,7 +103,7 @@ static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb,
        int rc;
 
        /* pass entropy and vl as metadata in skb */
-       mdata = (struct opa_vnic_skb_mdata *)skb_push(skb, sizeof(*mdata));
+       mdata = skb_push(skb, sizeof(*mdata));
        mdata->entropy =  opa_vnic_calc_entropy(adapter, skb);
        mdata->vl = opa_vnic_get_vl(adapter, skb);
        rc = adapter->rn_ops->ndo_select_queue(netdev, skb,