Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / net / cxgb3 / sge.c

diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 8ff96c6f6de53304789a16de04a98ac86d1f7d15..f9f6645b2e61341af8b3c2c37dd438c024c3b0c4 100644 (file)
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -296,8 +296,10 @@ static void free_tx_desc(struct adapter *adapter, struct sge_txq *q,
                if (d->skb) {   /* an SGL is present */
                        if (need_unmap)
                                unmap_skb(d->skb, q, cidx, pdev);
-                       if (d->eop)
+                       if (d->eop) {
                                kfree_skb(d->skb);
+                               d->skb = NULL;
+                       }
                }
                ++d;
                if (++cidx == q->size) {
@@ -1145,7 +1147,7 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,
        cpl->len = htonl(skb->len);
        cntrl = V_TXPKT_INTF(pi->port_id);
 
-       if (vlan_tx_tag_present(skb) && pi->vlan_grp)
+       if (vlan_tx_tag_present(skb))
                cntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(vlan_tx_tag_get(skb));
 
        tso_info = V_LSO_MSS(skb_shinfo(skb)->gso_size);
@@ -1279,7 +1281,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
                qs->port_stats[SGE_PSTAT_TX_CSUM]++;
        if (skb_shinfo(skb)->gso_size)
                qs->port_stats[SGE_PSTAT_TSO]++;
-       if (vlan_tx_tag_present(skb) && pi->vlan_grp)
+       if (vlan_tx_tag_present(skb))
                qs->port_stats[SGE_PSTAT_VLANINS]++;
 
        /*
@@ -2022,7 +2024,7 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
                qs->port_stats[SGE_PSTAT_RX_CSUM_GOOD]++;
                skb->ip_summed = CHECKSUM_UNNECESSARY;
        } else
-               skb->ip_summed = CHECKSUM_NONE;
+               skb_checksum_none_assert(skb);
        skb_record_rx_queue(skb, qs - &adap->sge.qs[0]);
 
        if (unlikely(p->vlan_valid)) {
@@ -2554,7 +2556,7 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
  * The MSI-X interrupt handler for an SGE response queue for the non-NAPI case
  * (i.e., response queue serviced in hard interrupt).
  */
-irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
+static irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 {
        struct sge_qset *qs = cookie;
        struct adapter *adap = qs->adap;
@@ -3320,40 +3322,3 @@ void t3_sge_prep(struct adapter *adap, struct sge_params *p)
 
        spin_lock_init(&adap->sge.reg_lock);
 }
-
-/**
- *     t3_get_desc - dump an SGE descriptor for debugging purposes
- *     @qs: the queue set
- *     @qnum: identifies the specific queue (0..2: Tx, 3:response, 4..5: Rx)
- *     @idx: the descriptor index in the queue
- *     @data: where to dump the descriptor contents
- *
- *     Dumps the contents of a HW descriptor of an SGE queue.  Returns the
- *     size of the descriptor.
- */
-int t3_get_desc(const struct sge_qset *qs, unsigned int qnum, unsigned int idx,
-               unsigned char *data)
-{
-       if (qnum >= 6)
-               return -EINVAL;
-
-       if (qnum < 3) {
-               if (!qs->txq[qnum].desc || idx >= qs->txq[qnum].size)
-                       return -EINVAL;
-               memcpy(data, &qs->txq[qnum].desc[idx], sizeof(struct tx_desc));
-               return sizeof(struct tx_desc);
-       }
-
-       if (qnum == 3) {
-               if (!qs->rspq.desc || idx >= qs->rspq.size)
-                       return -EINVAL;
-               memcpy(data, &qs->rspq.desc[idx], sizeof(struct rsp_desc));
-               return sizeof(struct rsp_desc);
-       }
-
-       qnum -= 4;
-       if (!qs->fl[qnum].desc || idx >= qs->fl[qnum].size)
-               return -EINVAL;
-       memcpy(data, &qs->fl[qnum].desc[idx], sizeof(struct rx_desc));
-       return sizeof(struct rx_desc);
-}