Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / bna / bfa_defs_mfg_comm.h

diff --git a/drivers/net/bna/bfa_defs_mfg_comm.h b/drivers/net/bna/bfa_defs_mfg_comm.h
index 987978fcb3fe741a60beb98a4bdf17387540e082..fdd6776183615477a83e9a685e1f66becf166613 100644 (file)
--- a/drivers/net/bna/bfa_defs_mfg_comm.h
+++ b/drivers/net/bna/bfa_defs_mfg_comm.h
@@ -95,28 +95,6 @@ enum {
        (type) == BFA_MFG_TYPE_CNA10P1 || \
        bfa_mfg_is_mezz(type)))
 
-/**
- * Check if the card having old wwn/mac handling
- */
-#define bfa_mfg_is_old_wwn_mac_model(type) (( \
-       (type) == BFA_MFG_TYPE_FC8P2 || \
-       (type) == BFA_MFG_TYPE_FC8P1 || \
-       (type) == BFA_MFG_TYPE_FC4P2 || \
-       (type) == BFA_MFG_TYPE_FC4P1 || \
-       (type) == BFA_MFG_TYPE_CNA10P2 || \
-       (type) == BFA_MFG_TYPE_CNA10P1 || \
-       (type) == BFA_MFG_TYPE_JAYHAWK || \
-       (type) == BFA_MFG_TYPE_WANCHESE))
-
-#define bfa_mfg_increment_wwn_mac(m, i)                                \
-do {                                                           \
-       u32 t = ((m)[0] << 16) | ((m)[1] << 8) | (m)[2];        \
-       t += (i);                                               \
-       (m)[0] = (t >> 16) & 0xFF;                              \
-       (m)[1] = (t >> 8) & 0xFF;                               \
-       (m)[2] = t & 0xFF;                                      \
-} while (0)
-
 #define bfa_mfg_adapter_prop_init_flash(card_type, prop)       \
 do {                                                           \
        switch ((card_type)) {                                  \