Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[mv-sheeva.git] / drivers / net / cxgb3 / adapter.h

diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index c888e97c9671b0cef29f3e698f454b94830b5473..1694fad387206daf30cadbec9f9b3b6a3c2d2cc8 100644 (file)
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -195,7 +195,7 @@ struct sge_qset {           /* an SGE queue set */
        struct sge_rspq rspq;
        struct sge_fl fl[SGE_RXQ_PER_SET];
        struct sge_txq txq[SGE_TXQ_PER_SET];
-       struct napi_gro_fraginfo lro_frag_tbl;
+       int nomem;
        int lro_enabled;
        void *lro_va;
        struct net_device *netdev;
@@ -253,6 +253,8 @@ struct adapter {
        struct mutex mdio_lock;
        spinlock_t stats_lock;
        spinlock_t work_lock;
+
+       struct sk_buff *nofail_skb;
 };
 
 static inline u32 t3_read_reg(struct adapter *adapter, u32 reg_addr)