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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c

1 files changed, 50 insertions, 0 deletions

diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h
new file mode 100644
index 000000000000..f6999c2b622d
--- /dev/null
+++ b/drivers/net/sfc/selftest.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+ * Driver for Solarflare Solarstorm network controllers and boards
+ * Copyright 2005-2006 Fen Systems Ltd.
+ * Copyright 2006-2008 Solarflare Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+#ifndef EFX_SELFTEST_H
+#define EFX_SELFTEST_H
+
+#include "net_driver.h"
+
+/*
+ * Self tests
+ */
+
+struct efx_loopback_self_tests {
+        int tx_sent[EFX_MAX_TX_QUEUES];
+        int tx_done[EFX_MAX_TX_QUEUES];
+        int rx_good;
+        int rx_bad;
+};
+
+/* Efx self test results
+ * For fields which are not counters, 1 indicates success and -1
+ * indicates failure.
+ */
+struct efx_self_tests {
+        int interrupt;
+        int eventq_dma[EFX_MAX_CHANNELS];
+        int eventq_int[EFX_MAX_CHANNELS];
+        int eventq_poll[EFX_MAX_CHANNELS];
+        int phy_ok;
+        int loopback_speed;
+        int loopback_full_duplex;
+        struct efx_loopback_self_tests loopback[LOOPBACK_TEST_MAX];
+};
+
+extern void efx_loopback_rx_packet(struct efx_nic *efx,
+                                   const char *buf_ptr, int pkt_len);
+extern int efx_online_test(struct efx_nic *efx,
+                           struct efx_self_tests *tests);
+extern int efx_offline_test(struct efx_nic *efx,
+                            struct efx_self_tests *tests,
+                            unsigned int loopback_modes);
+
+#endif /* EFX_SELFTEST_H */