Merge branch 'linus/master' into rdma.git for-next

[linux-2.6-block.git] / drivers / infiniband / hw / hfi1 / vnic_main.c

diff --git a/drivers/infiniband/hw/hfi1/vnic_main.c b/drivers/infiniband/hw/hfi1/vnic_main.c
index ba160f99cf8e8b3ed940d18f8c25c8a31e992162..c643d80c5a5316b4e44e3ff76982820fb6efd8fd 100644 (file)
--- a/drivers/infiniband/hw/hfi1/vnic_main.c
+++ b/drivers/infiniband/hw/hfi1/vnic_main.c
@@ -421,7 +421,7 @@ tx_finish:
 
 static u16 hfi1_vnic_select_queue(struct net_device *netdev,
                                  struct sk_buff *skb,
-                                 void *accel_priv,
+                                 struct net_device *sb_dev,
                                  select_queue_fallback_t fallback)
 {
        struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);