1 files changed, 43 insertions, 25 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 4b875da1c7ed..4ccc806b1150 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -227,6 +227,12 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,
         --nbd;
         bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
 
+        if (tx_buf->flags & BNX2X_HAS_SECOND_PBD) {
+                /* Skip second parse bd... */
+                --nbd;
+                bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+        }
+
         /* TSO headers+data bds share a common mapping. See bnx2x_tx_split() */
         if (tx_buf->flags & BNX2X_TSO_SPLIT_BD) {
                 tx_data_bd = &txdata->tx_desc_ring[bd_idx].reg_bd;
@@ -477,11 +483,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
 
 #ifdef BNX2X_STOP_ON_ERROR
         fp->tpa_queue_used |= (1 << queue);
-#ifdef _ASM_GENERIC_INT_L64_H
-        DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n",
-#else
         DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%llx\n",
-#endif
            fp->tpa_queue_used);
 #endif
 }
@@ -1186,29 +1188,38 @@ u16 bnx2x_get_mf_speed(struct bnx2x *bp)
 static void bnx2x_fill_report_data(struct bnx2x *bp,
                                    struct bnx2x_link_report_data *data)
 {
-        u16 line_speed = bnx2x_get_mf_speed(bp);
-
         memset(data, 0, sizeof(*data));
 
-        /* Fill the report data: effective line speed */
-        data->line_speed = line_speed;
-
-        /* Link is down */
-        if (!bp->link_vars.link_up || (bp->flags & MF_FUNC_DIS))
-                __set_bit(BNX2X_LINK_REPORT_LINK_DOWN,
-                          &data->link_report_flags);
-
-        /* Full DUPLEX */
-        if (bp->link_vars.duplex == DUPLEX_FULL)
-                __set_bit(BNX2X_LINK_REPORT_FD, &data->link_report_flags);
-
-        /* Rx Flow Control is ON */
-        if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_RX)
-                __set_bit(BNX2X_LINK_REPORT_RX_FC_ON, &data->link_report_flags);
-
-        /* Tx Flow Control is ON */
-        if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_TX)
-                __set_bit(BNX2X_LINK_REPORT_TX_FC_ON, &data->link_report_flags);
+        if (IS_PF(bp)) {
+                /* Fill the report data: effective line speed */
+                data->line_speed = bnx2x_get_mf_speed(bp);
+
+                /* Link is down */
+                if (!bp->link_vars.link_up || (bp->flags & MF_FUNC_DIS))
+                        __set_bit(BNX2X_LINK_REPORT_LINK_DOWN,
+                                  &data->link_report_flags);
+
+                if (!BNX2X_NUM_ETH_QUEUES(bp))
+                        __set_bit(BNX2X_LINK_REPORT_LINK_DOWN,
+                                  &data->link_report_flags);
+
+                /* Full DUPLEX */
+                if (bp->link_vars.duplex == DUPLEX_FULL)
+                        __set_bit(BNX2X_LINK_REPORT_FD,
+                                  &data->link_report_flags);
+
+                /* Rx Flow Control is ON */
+                if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_RX)
+                        __set_bit(BNX2X_LINK_REPORT_RX_FC_ON,
+                                  &data->link_report_flags);
+
+                /* Tx Flow Control is ON */
+                if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_TX)
+                        __set_bit(BNX2X_LINK_REPORT_TX_FC_ON,
+                                  &data->link_report_flags);
+        } else { /* VF */
+                *data = bp->vf_link_vars;
+        }
 }
 
 /**
@@ -1262,6 +1273,10 @@ void __bnx2x_link_report(struct bnx2x *bp)
          */
         memcpy(&bp->last_reported_link, &cur_data, sizeof(cur_data));
 
+        /* propagate status to VFs */
+        if (IS_PF(bp))
+                bnx2x_iov_link_update(bp);
+
         if (test_bit(BNX2X_LINK_REPORT_LINK_DOWN,
                      &cur_data.link_report_flags)) {
                 netif_carrier_off(bp->dev);
@@ -3889,6 +3904,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         /* set encapsulation flag in start BD */
                         SET_FLAG(tx_start_bd->general_data,
                                  ETH_TX_START_BD_TUNNEL_EXIST, 1);
+
+                        tx_buf->flags |= BNX2X_HAS_SECOND_PBD;
+
                         nbd++;
                 } else if (xmit_type & XMIT_CSUM) {
                         /* Set PBD in checksum offload case w/o encapsulation */