networking: make skb_push & __skb_push return void pointers

[linux-2.6-block.git] / drivers / scsi / cxgbi / cxgb4i / cxgb4i.c

diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 1076c157832291b4794f2d4eaf0ea49489fb1abb..5485d68f286a5dfee5b22396776e58a8696cf335 100644 (file)
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -644,7 +644,7 @@ static inline void make_tx_data_wr(struct cxgbi_sock *csk, struct sk_buff *skb,
        unsigned int wr_ulp_mode = 0, val;
        bool imm = is_ofld_imm(skb);
 
-       req = (struct fw_ofld_tx_data_wr *)__skb_push(skb, sizeof(*req));
+       req = __skb_push(skb, sizeof(*req));
 
        if (imm) {
                req->op_to_immdlen = htonl(FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
@@ -806,7 +806,7 @@ static void do_act_establish(struct cxgbi_device *cdev, struct sk_buff *skb)
 
        cxgbi_sock_get(csk);
        csk->tid = tid;
-       cxgb4_insert_tid(lldi->tids, csk, tid);
+       cxgb4_insert_tid(lldi->tids, csk, tid, csk->csk_family);
        cxgbi_sock_set_flag(csk, CTPF_HAS_TID);
 
        free_atid(csk);
@@ -956,7 +956,8 @@ static void do_act_open_rpl(struct cxgbi_device *cdev, struct sk_buff *skb)
        if (status && status != CPL_ERR_TCAM_FULL &&
            status != CPL_ERR_CONN_EXIST &&
            status != CPL_ERR_ARP_MISS)
-               cxgb4_remove_tid(lldi->tids, csk->port_id, GET_TID(rpl));
+               cxgb4_remove_tid(lldi->tids, csk->port_id, GET_TID(rpl),
+                                csk->csk_family);
 
        cxgbi_sock_get(csk);
        spin_lock_bh(&csk->lock);
@@ -1590,12 +1591,12 @@ static void release_offload_resources(struct cxgbi_sock *csk)
                free_atid(csk);
        else if (cxgbi_sock_flag(csk, CTPF_HAS_TID)) {
                lldi = cxgbi_cdev_priv(csk->cdev);
-               cxgb4_remove_tid(lldi->tids, 0, csk->tid);
+               cxgb4_remove_tid(lldi->tids, 0, csk->tid,
+                                csk->csk_family);
                cxgbi_sock_clear_flag(csk, CTPF_HAS_TID);
                cxgbi_sock_put(csk);
        }
        csk->dst = NULL;
-       csk->cdev = NULL;
 }
 
 static int init_act_open(struct cxgbi_sock *csk)