Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h
index 643bef72b99d..aed495a4dad7 100644
--- a/drivers/net/sfc/selftest.h
+++ b/drivers/net/sfc/selftest.h
@@ -18,8 +18,8 @@
  */
 
 struct efx_loopback_self_tests {
-        int tx_sent[EFX_TX_QUEUE_COUNT];
-        int tx_done[EFX_TX_QUEUE_COUNT];
+        int tx_sent[EFX_TXQ_TYPES];
+        int tx_done[EFX_TXQ_TYPES];
         int rx_good;
         int rx_bad;
 };