Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index c69f4c0187d9..c5b3de1bb456 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -314,6 +314,12 @@ static int cxgb_rdma_ctl(struct adapter *adapter, unsigned int req, void *data)
                 spin_unlock_irq(&adapter->sge.reg_lock);
                 break;
         }
+        case RDMA_GET_MIB: {
+                spin_lock(&adapter->stats_lock);
+                t3_tp_get_mib_stats(adapter, (struct tp_mib_stats *)data);
+                spin_unlock(&adapter->stats_lock);
+                break;
+        }
         default:
                 ret = -EOPNOTSUPP;
         }
@@ -392,6 +398,7 @@ static int cxgb_offload_ctl(struct t3cdev *tdev, unsigned int req, void *data)
         case RDMA_CQ_DISABLE:
         case RDMA_CTRL_QP_SETUP:
         case RDMA_GET_MEM:
+        case RDMA_GET_MIB:
                 if (!offload_running(adapter))
                         return -EAGAIN;
                 return cxgb_rdma_ctl(adapter, req, data);