Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 0 insertions, 10 deletions

diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 4cd7f420766a..7300de5a1426 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -50,11 +50,6 @@ struct adapter;
 struct sge_qset;
 struct port_info;
 
-enum {                  /* rx_offload flags */
-        T3_RX_CSUM      = 1 << 0,
-        T3_LRO          = 1 << 1,
-};
-
 enum mac_idx_types {
         LAN_MAC_IDX     = 0,
         SAN_MAC_IDX,
@@ -74,7 +69,6 @@ struct port_info {
         struct vlan_group *vlan_grp;
         struct sge_qset *qs;
         u8 port_id;
-        u8 rx_offload;
         u8 nqsets;
         u8 first_qset;
         struct cphy phy;
@@ -212,7 +206,6 @@ struct sge_qset {		/* an SGE queue set */
         struct sge_fl fl[SGE_RXQ_PER_SET];
         struct sge_txq txq[SGE_TXQ_PER_SET];
         int nomem;
-        int lro_enabled;
         void *lro_va;
         struct net_device *netdev;
         struct netdev_queue *tx_q;      /* associated netdev TX queue */
@@ -336,9 +329,6 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
                       int irq_vec_idx, const struct qset_params *p,
                       int ntxq, struct net_device *dev,
                       struct netdev_queue *netdevq);
-int t3_get_desc(const struct sge_qset *qs, unsigned int qnum, unsigned int idx,
-                unsigned char *data);
-irqreturn_t t3_sge_intr_msix(int irq, void *cookie);
 extern struct workqueue_struct *cxgb3_wq;
 
 int t3_get_edc_fw(struct cphy *phy, int edc_idx, int size);