128 files changed, 7590 insertions, 3647 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 8fbe9fdac128..3b63b0b78122 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1,8 +1,12 @@
 #
 # HID driver configuration
 #
-menu "HID Devices"
+menuconfig HID_SUPPORT
+        bool "HID Devices"
         depends on INPUT
+        default y
+
+if HID_SUPPORT
 
 config HID
         tristate "Generic HID support"
@@ -24,6 +28,7 @@ config HID
 
 config HID_DEBUG
         bool "HID debugging support"
+        default y if !EMBEDDED
         depends on HID
         ---help---
         This option lets the HID layer output diagnostics about its internal
@@ -38,5 +43,4 @@ config HID_DEBUG
 
 source "drivers/hid/usbhid/Kconfig"
 
-endmenu
-
+endif # HID_SUPPORT
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6ec04e79f685..317cf8a7b63c 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -40,6 +40,13 @@
 #define DRIVER_DESC "HID core driver"
 #define DRIVER_LICENSE "GPL"
 
+#ifdef CONFIG_HID_DEBUG
+int hid_debug = 0;
+module_param_named(debug, hid_debug, bool, 0600);
+MODULE_PARM_DESC(debug, "Turn HID debugging mode on and off");
+EXPORT_SYMBOL_GPL(hid_debug);
+#endif
+
 /*
  * Register a new report for a device.
  */
@@ -78,7 +85,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned
         struct hid_field *field;
 
         if (report->maxfield == HID_MAX_FIELDS) {
-                dbg("too many fields in report");
+                dbg_hid("too many fields in report\n");
                 return NULL;
         }
 
@@ -106,7 +113,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
         usage = parser->local.usage[0];
 
         if (parser->collection_stack_ptr == HID_COLLECTION_STACK_SIZE) {
-                dbg("collection stack overflow");
+                dbg_hid("collection stack overflow\n");
                 return -1;
         }
 
@@ -114,7 +121,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
                 collection = kmalloc(sizeof(struct hid_collection) *
                                 parser->device->collection_size * 2, GFP_KERNEL);
                 if (collection == NULL) {
-                        dbg("failed to reallocate collection array");
+                        dbg_hid("failed to reallocate collection array\n");
                         return -1;
                 }
                 memcpy(collection, parser->device->collection,
@@ -150,7 +157,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
 static int close_collection(struct hid_parser *parser)
 {
         if (!parser->collection_stack_ptr) {
-                dbg("collection stack underflow");
+                dbg_hid("collection stack underflow\n");
                 return -1;
         }
         parser->collection_stack_ptr--;
@@ -178,7 +185,7 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)
 static int hid_add_usage(struct hid_parser *parser, unsigned usage)
 {
         if (parser->local.usage_index >= HID_MAX_USAGES) {
-                dbg("usage index exceeded");
+                dbg_hid("usage index exceeded\n");
                 return -1;
         }
         parser->local.usage[parser->local.usage_index] = usage;
@@ -202,12 +209,12 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
         int i;
 
         if (!(report = hid_register_report(parser->device, report_type, parser->global.report_id))) {
-                dbg("hid_register_report failed");
+                dbg_hid("hid_register_report failed\n");
                 return -1;
         }
 
         if (parser->global.logical_maximum < parser->global.logical_minimum) {
-                dbg("logical range invalid %d %d", parser->global.logical_minimum, parser->global.logical_maximum);
+                dbg_hid("logical range invalid %d %d\n", parser->global.logical_minimum, parser->global.logical_maximum);
                 return -1;
         }
 
@@ -287,7 +294,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
                 case HID_GLOBAL_ITEM_TAG_PUSH:
 
                         if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) {
-                                dbg("global enviroment stack overflow");
+                                dbg_hid("global enviroment stack overflow\n");
                                 return -1;
                         }
 
@@ -298,7 +305,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
                 case HID_GLOBAL_ITEM_TAG_POP:
 
                         if (!parser->global_stack_ptr) {
-                                dbg("global enviroment stack underflow");
+                                dbg_hid("global enviroment stack underflow\n");
                                 return -1;
                         }
 
@@ -342,27 +349,27 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
 
                 case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
                         if ((parser->global.report_size = item_udata(item)) > 32) {
-                                dbg("invalid report_size %d", parser->global.report_size);
+                                dbg_hid("invalid report_size %d\n", parser->global.report_size);
                                 return -1;
                         }
                         return 0;
 
                 case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:
                         if ((parser->global.report_count = item_udata(item)) > HID_MAX_USAGES) {
-                                dbg("invalid report_count %d", parser->global.report_count);
+                                dbg_hid("invalid report_count %d\n", parser->global.report_count);
                                 return -1;
                         }
                         return 0;
 
                 case HID_GLOBAL_ITEM_TAG_REPORT_ID:
                         if ((parser->global.report_id = item_udata(item)) == 0) {
-                                dbg("report_id 0 is invalid");
+                                dbg_hid("report_id 0 is invalid\n");
                                 return -1;
                         }
                         return 0;
 
                 default:
-                        dbg("unknown global tag 0x%x", item->tag);
+                        dbg_hid("unknown global tag 0x%x\n", item->tag);
                         return -1;
         }
 }
@@ -377,7 +384,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
         unsigned n;
 
         if (item->size == 0) {
-                dbg("item data expected for local item");
+                dbg_hid("item data expected for local item\n");
                 return -1;
         }
 
@@ -395,14 +402,14 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
                                  * items and the first delimiter set.
                                  */
                                 if (parser->local.delimiter_depth != 0) {
-                                        dbg("nested delimiters");
+                                        dbg_hid("nested delimiters\n");
                                         return -1;
                                 }
                                 parser->local.delimiter_depth++;
                                 parser->local.delimiter_branch++;
                         } else {
                                 if (parser->local.delimiter_depth < 1) {
-                                        dbg("bogus close delimiter");
+                                        dbg_hid("bogus close delimiter\n");
                                         return -1;
                                 }
                                 parser->local.delimiter_depth--;
@@ -412,7 +419,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
                 case HID_LOCAL_ITEM_TAG_USAGE:
 
                         if (parser->local.delimiter_branch > 1) {
-                                dbg("alternative usage ignored");
+                                dbg_hid("alternative usage ignored\n");
                                 return 0;
                         }
 
@@ -424,7 +431,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
                 case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:
 
                         if (parser->local.delimiter_branch > 1) {
-                                dbg("alternative usage ignored");
+                                dbg_hid("alternative usage ignored\n");
                                 return 0;
                         }
 
@@ -437,7 +444,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
                 case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM:
 
                         if (parser->local.delimiter_branch > 1) {
-                                dbg("alternative usage ignored");
+                                dbg_hid("alternative usage ignored\n");
                                 return 0;
                         }
 
@@ -446,14 +453,14 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
 
                         for (n = parser->local.usage_minimum; n <= data; n++)
                                 if (hid_add_usage(parser, n)) {
-                                        dbg("hid_add_usage failed\n");
+                                        dbg_hid("hid_add_usage failed\n");
                                         return -1;
                                 }
                         return 0;
 
                 default:
 
-                        dbg("unknown local item tag 0x%x", item->tag);
+                        dbg_hid("unknown local item tag 0x%x\n", item->tag);
                         return 0;
         }
         return 0;
@@ -487,7 +494,7 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)
                         ret = hid_add_field(parser, HID_FEATURE_REPORT, data);
                         break;
                 default:
-                        dbg("unknown main item tag 0x%x", item->tag);
+                        dbg_hid("unknown main item tag 0x%x\n", item->tag);
                         ret = 0;
         }
 
@@ -502,7 +509,7 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)
 
 static int hid_parser_reserved(struct hid_parser *parser, struct hid_item *item)
 {
-        dbg("reserved item type, tag 0x%x", item->tag);
+        dbg_hid("reserved item type, tag 0x%x\n", item->tag);
         return 0;
 }
 
@@ -667,14 +674,14 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
         while ((start = fetch_item(start, end, &item)) != NULL) {
 
                 if (item.format != HID_ITEM_FORMAT_SHORT) {
-                        dbg("unexpected long global item");
+                        dbg_hid("unexpected long global item\n");
                         hid_free_device(device);
                         vfree(parser);
                         return NULL;
                 }
 
                 if (dispatch_type[item.type](parser, &item)) {
-                        dbg("item %u %u %u %u parsing failed\n",
+                        dbg_hid("item %u %u %u %u parsing failed\n",
                                 item.format, (unsigned)item.size, (unsigned)item.type, (unsigned)item.tag);
                         hid_free_device(device);
                         vfree(parser);
@@ -683,13 +690,13 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
 
                 if (start == end) {
                         if (parser->collection_stack_ptr) {
-                                dbg("unbalanced collection at end of report description");
+                                dbg_hid("unbalanced collection at end of report description\n");
                                 hid_free_device(device);
                                 vfree(parser);
                                 return NULL;
                         }
                         if (parser->local.delimiter_depth) {
-                                dbg("unbalanced delimiter at end of report description");
+                                dbg_hid("unbalanced delimiter at end of report description\n");
                                 hid_free_device(device);
                                 vfree(parser);
                                 return NULL;
@@ -699,7 +706,7 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
                 }
         }
 
-        dbg("item fetching failed at offset %d\n", (int)(end - start));
+        dbg_hid("item fetching failed at offset %d\n", (int)(end - start));
         hid_free_device(device);
         vfree(parser);
         return NULL;
@@ -915,13 +922,13 @@ int hid_set_field(struct hid_field *field, unsigned offset, __s32 value)
         hid_dump_input(field->usage + offset, value);
 
         if (offset >= field->report_count) {
-                dbg("offset (%d) exceeds report_count (%d)", offset, field->report_count);
+                dbg_hid("offset (%d) exceeds report_count (%d)\n", offset, field->report_count);
                 hid_dump_field(field, 8);
                 return -1;
         }
         if (field->logical_minimum < 0) {
                 if (value != snto32(s32ton(value, size), size)) {
-                        dbg("value %d is out of range", value);
+                        dbg_hid("value %d is out of range\n", value);
                         return -1;
                 }
         }
@@ -934,19 +941,17 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
 {
         struct hid_report_enum *report_enum = hid->report_enum + type;
         struct hid_report *report;
-        int n, rsize;
+        int n, rsize, i;
 
         if (!hid)
                 return -ENODEV;
 
         if (!size) {
-                dbg("empty report");
+                dbg_hid("empty report\n");
                 return -1;
         }
 
-#ifdef CONFIG_HID_DEBUG
-        printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
-#endif
+        dbg_hid("report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
 
         n = 0;                          /* Normally report number is 0 */
         if (report_enum->numbered) {    /* Device uses numbered reports, data[0] is report number */
@@ -954,25 +959,21 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                 size--;
         }
 
-#ifdef CONFIG_HID_DEBUG
-        {
-                int i;
-                printk(KERN_DEBUG __FILE__ ": report %d (size %u) = ", n, size);
-                for (i = 0; i < size; i++)
-                        printk(" %02x", data[i]);
-                printk("\n");
-        }
-#endif
+        /* dump the report descriptor */
+        dbg_hid("report %d (size %u) = ", n, size);
+        for (i = 0; i < size; i++)
+                dbg_hid_line(" %02x", data[i]);
+        dbg_hid_line("\n");
 
         if (!(report = report_enum->report_id_hash[n])) {
-                dbg("undefined report_id %d received", n);
+                dbg_hid("undefined report_id %d received\n", n);
                 return -1;
         }
 
         rsize = ((report->size - 1) >> 3) + 1;
 
         if (size < rsize) {
-                dbg("report %d is too short, (%d < %d)", report->id, size, rsize);
+                dbg_hid("report %d is too short, (%d < %d)\n", report->id, size, rsize);
                 memset(data + size, 0, rsize - size);
         }
 
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 83c4126b37c3..a13757b78980 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -347,6 +347,9 @@ static void resolv_usage_page(unsigned page) {
 void hid_resolv_usage(unsigned usage) {
         const struct hid_usage_entry *p;
 
+        if (!hid_debug)
+                return;
+
         resolv_usage_page(usage >> 16);
         printk(".");
         for (p = hid_usage_table; p->description; p++)
@@ -369,6 +372,9 @@ __inline__ static void tab(int n) {
 void hid_dump_field(struct hid_field *field, int n) {
         int j;
 
+        if (!hid_debug)
+                return;
+
         if (field->physical) {
                 tab(n);
                 printk("Physical(");
@@ -466,6 +472,9 @@ void hid_dump_device(struct hid_device *device) {
         unsigned i,k;
         static char *table[] = {"INPUT", "OUTPUT", "FEATURE"};
 
+        if (!hid_debug)
+                return;
+
         for (i = 0; i < HID_REPORT_TYPES; i++) {
                 report_enum = device->report_enum + i;
                 list = report_enum->report_list.next;
@@ -489,6 +498,9 @@ void hid_dump_device(struct hid_device *device) {
 EXPORT_SYMBOL_GPL(hid_dump_device);
 
 void hid_dump_input(struct hid_usage *usage, __s32 value) {
+        if (!hid_debug)
+                return;
+
         printk("hid-debug: input ");
         hid_resolv_usage(usage->hid);
         printk(" = %d\n", value);
@@ -758,6 +770,9 @@ static char **names[EV_MAX + 1] = {
 
 void hid_resolv_event(__u8 type, __u16 code) {
 
+        if (!hid_debug)
+                return;
+
         printk("%s.%s", events[type] ? events[type] : "?",
                 names[type] ? (names[type][code] ? names[type][code] : "?") : "?");
 }
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 7f817897b178..8edbd30cf795 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -60,6 +60,19 @@ static const unsigned char hid_keyboard[256] = {
         150,158,159,128,136,177,178,176,142,152,173,140,unk,unk,unk,unk
 };
 
+/* extended mapping for certain Logitech hardware (Logitech cordless desktop LX500) */
+#define LOGITECH_EXPANDED_KEYMAP_SIZE 80
+static int logitech_expanded_keymap[LOGITECH_EXPANDED_KEYMAP_SIZE] = {
+          0,216,  0,213,175,156,  0,  0,  0,  0,
+        144,  0,  0,  0,  0,  0,  0,  0,  0,212,
+        174,167,152,161,112,  0,  0,  0,154,  0,
+          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+          0,  0,  0,  0,  0,183,184,185,186,187,
+        188,189,190,191,192,193,194,  0,  0,  0
+};
+
 static const struct {
         __s32 x;
         __s32 y;
@@ -308,9 +321,7 @@ static int hidinput_setkeycode(struct input_dev *dev, int scancode,
                 
                 clear_bit(old_keycode, dev->keybit);
                 set_bit(usage->code, dev->keybit);
-#ifdef CONFIG_HID_DEBUG
-                printk (KERN_DEBUG "Assigned keycode %d to HID usage code %x\n", keycode, scancode);
-#endif
+                dbg_hid(KERN_DEBUG "Assigned keycode %d to HID usage code %x\n", keycode, scancode);
                 /* Set the keybit for the old keycode if the old keycode is used
                  * by another key */
                 if (hidinput_find_key (hid, 0, old_keycode))
@@ -333,11 +344,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
         field->hidinput = hidinput;
 
-#ifdef CONFIG_HID_DEBUG
-        printk(KERN_DEBUG "Mapping: ");
+        dbg_hid("Mapping: ");
         hid_resolv_usage(usage->hid);
-        printk(" ---> ");
-#endif
+        dbg_hid_line(" ---> ");
 
         if (field->flags & HID_MAIN_ITEM_CONSTANT)
                 goto ignore;
@@ -378,6 +387,21 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                         }
                         }
 
+                        /* Special handling for Logitech Cordless Desktop */
+                        if (field->application != HID_GD_MOUSE) {
+                                if (device->quirks & HID_QUIRK_LOGITECH_EXPANDED_KEYMAP) {
+                                        int hid = usage->hid & HID_USAGE;
+                                        if (hid < LOGITECH_EXPANDED_KEYMAP_SIZE && logitech_expanded_keymap[hid] != 0)
+                                                code = logitech_expanded_keymap[hid];
+                                }
+                        } else {
+                                if (device->quirks & HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL) {
+                                        int hid = usage->hid & HID_USAGE;
+                                        if (hid == 7 || hid == 8)
+                                                goto ignore;
+                                }
+                        }
+
                         map_key(code);
                         break;
 
@@ -566,6 +590,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x0e5: map_key_clear(KEY_BASSBOOST);       break;
                                 case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
                                 case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
+
+                                /* reserved in HUT 1.12. Reported on Petalynx remote */
+                                case 0x0f6: map_key_clear(KEY_NEXT);            break;
+                                case 0x0fa: map_key_clear(KEY_BACK);            break;
+
                                 case 0x183: map_key_clear(KEY_CONFIG);          break;
                                 case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
                                 case 0x185: map_key_clear(KEY_EDITOR);          break;
@@ -598,7 +627,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x21b: map_key_clear(KEY_COPY);            break;
                                 case 0x21c: map_key_clear(KEY_CUT);             break;
                                 case 0x21d: map_key_clear(KEY_PASTE);           break;
-                                case 0x221: map_key_clear(KEY_FIND);            break;
+                                case 0x21f: map_key_clear(KEY_FIND);            break;
+                                case 0x221: map_key_clear(KEY_SEARCH);          break;
+                                case 0x222: map_key_clear(KEY_GOTO);            break;
                                 case 0x223: map_key_clear(KEY_HOMEPAGE);        break;
                                 case 0x224: map_key_clear(KEY_BACK);            break;
                                 case 0x225: map_key_clear(KEY_FORWARD);         break;
@@ -688,7 +719,28 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         break;
 
                 case HID_UP_MSVENDOR:
-                        goto ignore;
+
+                        /* special case - Chicony Chicony KU-0418 tactical pad */
+                        if (device->vendor == 0x04f2 && device->product == 0x0418) {
+                                set_bit(EV_REP, input->evbit);
+                                switch(usage->hid & HID_USAGE) {
+                                        case 0xff01: map_key_clear(BTN_1);              break;
+                                        case 0xff02: map_key_clear(BTN_2);              break;
+                                        case 0xff03: map_key_clear(BTN_3);              break;
+                                        case 0xff04: map_key_clear(BTN_4);              break;
+                                        case 0xff05: map_key_clear(BTN_5);              break;
+                                        case 0xff06: map_key_clear(BTN_6);              break;
+                                        case 0xff07: map_key_clear(BTN_7);              break;
+                                        case 0xff08: map_key_clear(BTN_8);              break;
+                                        case 0xff09: map_key_clear(BTN_9);              break;
+                                        case 0xff0a: map_key_clear(BTN_A);              break;
+                                        case 0xff0b: map_key_clear(BTN_B);              break;
+                                        default:    goto ignore;
+                                }
+                        } else {
+                                goto ignore;
+                        }
+                        break;
 
                 case HID_UP_CUSTOM: /* Reported on Logitech and Powerbook USB keyboards */
 
@@ -704,10 +756,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         }
                         break;
 
-                case HID_UP_LOGIVENDOR: /* Reported on Logitech Ultra X Media Remote */
-
+                case HID_UP_LOGIVENDOR:
                         set_bit(EV_REP, input->evbit);
                         switch(usage->hid & HID_USAGE) {
+                                /* Reported on Logitech Ultra X Media Remote */
                                 case 0x004: map_key_clear(KEY_AGAIN);           break;
                                 case 0x00d: map_key_clear(KEY_HOME);            break;
                                 case 0x024: map_key_clear(KEY_SHUFFLE);         break;
@@ -725,6 +777,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
                                 case 0x051: map_key_clear(KEY_RED);             break;
                                 case 0x052: map_key_clear(KEY_CLOSE);           break;
+
+                                /* Reported on Petalynx Maxter remote */
+                                case 0x05a: map_key_clear(KEY_TEXT);            break;
+                                case 0x05b: map_key_clear(KEY_RED);             break;
+                                case 0x05c: map_key_clear(KEY_GREEN);           break;
+                                case 0x05d: map_key_clear(KEY_YELLOW);          break;
+                                case 0x05e: map_key_clear(KEY_BLUE);            break;
+
                                 default:    goto ignore;
                         }
                         break;
@@ -818,16 +878,24 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         field->dpad = usage->code;
         }
 
+        /* for those devices which produce Consumer volume usage as relative,
+         * we emulate pressing volumeup/volumedown appropriate number of times
+         * in hidinput_hid_event()
+         */
+        if ((usage->type == EV_ABS) && (field->flags & HID_MAIN_ITEM_RELATIVE) &&
+                        (usage->code == ABS_VOLUME)) {
+                set_bit(KEY_VOLUMEUP, input->keybit);
+                set_bit(KEY_VOLUMEDOWN, input->keybit);
+        }
+
         hid_resolv_event(usage->type, usage->code);
-#ifdef CONFIG_HID_DEBUG
-        printk("\n");
-#endif
+
+        dbg_hid_line("\n");
+
         return;
 
 ignore:
-#ifdef CONFIG_HID_DEBUG
-        printk("IGNORED\n");
-#endif
+        dbg_hid_line("IGNORED\n");
         return;
 }
 
@@ -896,18 +964,33 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
         }
 
         if (usage->hid == (HID_UP_PID | 0x83UL)) { /* Simultaneous Effects Max */
-                dbg("Maximum Effects - %d",value);
+                dbg_hid("Maximum Effects - %d\n",value);
                 return;
         }
 
         if (usage->hid == (HID_UP_PID | 0x7fUL)) {
-                dbg("PID Pool Report\n");
+                dbg_hid("PID Pool Report\n");
                 return;
         }
 
         if ((usage->type == EV_KEY) && (usage->code == 0)) /* Key 0 is "unassigned", not KEY_UNKNOWN */
                 return;
 
+        if ((usage->type == EV_ABS) && (field->flags & HID_MAIN_ITEM_RELATIVE) &&
+                        (usage->code == ABS_VOLUME)) {
+                int count = abs(value);
+                int direction = value > 0 ? KEY_VOLUMEUP : KEY_VOLUMEDOWN;
+                int i;
+
+                for (i = 0; i < count; i++) {
+                        input_event(input, EV_KEY, direction, 1);
+                        input_sync(input);
+                        input_event(input, EV_KEY, direction, 0);
+                        input_sync(input);
+                }
+                return;
+        }
+
         input_event(input, usage->type, usage->code, value);
 
         if ((field->flags & HID_MAIN_ITEM_RELATIVE) && (usage->type == EV_KEY))
@@ -976,7 +1059,7 @@ int hidinput_connect(struct hid_device *hid)
                         if (IS_INPUT_APPLICATION(hid->collection[i].usage))
                                 break;
 
-        if (i == hid->maxcollection)
+        if (i == hid->maxcollection && (hid->quirks & HID_QUIRK_HIDINPUT) == 0)
                 return -1;
 
         if (hid->quirks & HID_QUIRK_SKIP_OUTPUT_REPORTS)
@@ -994,7 +1077,7 @@ int hidinput_connect(struct hid_device *hid)
                                 if (!hidinput || !input_dev) {
                                         kfree(hidinput);
                                         input_free_device(input_dev);
-                                        err("Out of memory during hid input probe");
+                                        err_hid("Out of memory during hid input probe");
                                         return -1;
                                 }
 
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index d91b9dac6dff..3afa4a5035b7 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -60,6 +60,12 @@ MODULE_PARM_DESC(quirks, "Add/modify USB HID quirks by specifying "
                 " quirks=vendorID:productID:quirks"
                 " where vendorID, productID, and quirks are all in"
                 " 0x-prefixed hex");
+static char *rdesc_quirks_param[MAX_USBHID_BOOT_QUIRKS] = { [ 0 ... (MAX_USBHID_BOOT_QUIRKS - 1) ] = NULL };
+module_param_array_named(rdesc_quirks, rdesc_quirks_param, charp, NULL, 0444);
+MODULE_PARM_DESC(rdesc_quirks, "Add/modify report descriptor quirks by specifying "
+                " rdesc_quirks=vendorID:productID:rdesc_quirks"
+                " where vendorID, productID, and rdesc_quirks are all in"
+                " 0x-prefixed hex");
 /*
  * Input submission and I/O error handler.
  */
@@ -127,7 +133,7 @@ static void hid_reset(struct work_struct *work)
                         hid_io_error(hid);
                 break;
         default:
-                err("can't reset device, %s-%s/input%d, status %d",
+                err_hid("can't reset device, %s-%s/input%d, status %d",
                                 hid_to_usb_dev(hid)->bus->bus_name,
                                 hid_to_usb_dev(hid)->devpath,
                                 usbhid->ifnum, rc);
@@ -220,7 +226,7 @@ static void hid_irq_in(struct urb *urb)
         if (status) {
                 clear_bit(HID_IN_RUNNING, &usbhid->iofl);
                 if (status != -EPERM) {
-                        err("can't resubmit intr, %s-%s/input%d, status %d",
+                        err_hid("can't resubmit intr, %s-%s/input%d, status %d",
                                         hid_to_usb_dev(hid)->bus->bus_name,
                                         hid_to_usb_dev(hid)->devpath,
                                         usbhid->ifnum, status);
@@ -240,10 +246,10 @@ static int hid_submit_out(struct hid_device *hid)
         usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0);
         usbhid->urbout->dev = hid_to_usb_dev(hid);
 
-        dbg("submitting out urb");
+        dbg_hid("submitting out urb\n");
 
         if (usb_submit_urb(usbhid->urbout, GFP_ATOMIC)) {
-                err("usb_submit_urb(out) failed");
+                err_hid("usb_submit_urb(out) failed");
                 return -1;
         }
 
@@ -287,12 +293,12 @@ static int hid_submit_ctrl(struct hid_device *hid)
         usbhid->cr->wIndex = cpu_to_le16(usbhid->ifnum);
         usbhid->cr->wLength = cpu_to_le16(len);
 
-        dbg("submitting ctrl urb: %s wValue=0x%04x wIndex=0x%04x wLength=%u",
+        dbg_hid("submitting ctrl urb: %s wValue=0x%04x wIndex=0x%04x wLength=%u\n",
                 usbhid->cr->bRequest == HID_REQ_SET_REPORT ? "Set_Report" : "Get_Report",
                 usbhid->cr->wValue, usbhid->cr->wIndex, usbhid->cr->wLength);
 
         if (usb_submit_urb(usbhid->urbctrl, GFP_ATOMIC)) {
-                err("usb_submit_urb(ctrl) failed");
+                err_hid("usb_submit_urb(ctrl) failed");
                 return -1;
         }
 
@@ -474,7 +480,7 @@ int usbhid_wait_io(struct hid_device *hid)
         if (!wait_event_timeout(hid->wait, (!test_bit(HID_CTRL_RUNNING, &usbhid->iofl) &&
                                         !test_bit(HID_OUT_RUNNING, &usbhid->iofl)),
                                         10*HZ)) {
-                dbg("timeout waiting for ctrl or out queue to clear");
+                dbg_hid("timeout waiting for ctrl or out queue to clear\n");
                 return -1;
         }
 
@@ -633,20 +639,6 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid)
 }
 
 /*
- * Cherry Cymotion keyboard have an invalid HID report descriptor,
- * that needs fixing before we can parse it.
- */
-
-static void hid_fixup_cymotion_descriptor(char *rdesc, int rsize)
-{
-        if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) {
-                info("Fixing up Cherry Cymotion report descriptor");
-                rdesc[11] = rdesc[16] = 0xff;
-                rdesc[12] = rdesc[17] = 0x03;
-        }
-}
-
-/*
  * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller
  * to "operational".  Without this, the ps3 controller will not report any
  * events.
@@ -667,51 +659,11 @@ static void hid_fixup_sony_ps3_controller(struct usb_device *dev, int ifnum)
                                  USB_CTRL_GET_TIMEOUT);
 
         if (result < 0)
-                err("%s failed: %d\n", __func__, result);
+                err_hid("%s failed: %d\n", __func__, result);
 
         kfree(buf);
 }
 
-/*
- * Certain Logitech keyboards send in report #3 keys which are far
- * above the logical maximum described in descriptor. This extends
- * the original value of 0x28c of logical maximum to 0x104d
- */
-static void hid_fixup_logitech_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 90 && rdesc[83] == 0x26
-                        && rdesc[84] == 0x8c
-                        && rdesc[85] == 0x02) {
-                info("Fixing up Logitech keyboard report descriptor");
-                rdesc[84] = rdesc[89] = 0x4d;
-                rdesc[85] = rdesc[90] = 0x10;
-        }
-}
-
-/*
- * Some USB barcode readers from cypress have usage min and usage max in
- * the wrong order
- */
-static void hid_fixup_cypress_descriptor(unsigned char *rdesc, int rsize)
-{
-        short fixed = 0;
-        int i;
-
-        for (i = 0; i < rsize - 4; i++) {
-                if (rdesc[i] == 0x29 && rdesc [i+2] == 0x19) {
-                        unsigned char tmp;
-
-                        rdesc[i] = 0x19; rdesc[i+2] = 0x29;
-                        tmp = rdesc[i+3];
-                        rdesc[i+3] = rdesc[i+1];
-                        rdesc[i+1] = tmp;
-                }
-        }
-
-        if (fixed)
-                info("Fixing up Cypress report descriptor");
-}
-
 static struct hid_device *usb_hid_configure(struct usb_interface *intf)
 {
         struct usb_host_interface *interface = intf->cur_altsetting;
@@ -746,7 +698,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) &&
             (!interface->desc.bNumEndpoints ||
              usb_get_extra_descriptor(&interface->endpoint[0], HID_DT_HID, &hdesc))) {
-                dbg("class descriptor not present\n");
+                dbg_hid("class descriptor not present\n");
                 return NULL;
         }
 
@@ -755,41 +707,34 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                         rsize = le16_to_cpu(hdesc->desc[n].wDescriptorLength);
 
         if (!rsize || rsize > HID_MAX_DESCRIPTOR_SIZE) {
-                dbg("weird size of report descriptor (%u)", rsize);
+                dbg_hid("weird size of report descriptor (%u)\n", rsize);
                 return NULL;
         }
 
         if (!(rdesc = kmalloc(rsize, GFP_KERNEL))) {
-                dbg("couldn't allocate rdesc memory");
+                dbg_hid("couldn't allocate rdesc memory\n");
                 return NULL;
         }
 
         hid_set_idle(dev, interface->desc.bInterfaceNumber, 0, 0);
 
         if ((n = hid_get_class_descriptor(dev, interface->desc.bInterfaceNumber, HID_DT_REPORT, rdesc, rsize)) < 0) {
-                dbg("reading report descriptor failed");
+                dbg_hid("reading report descriptor failed\n");
                 kfree(rdesc);
                 return NULL;
         }
 
-        if ((quirks & HID_QUIRK_CYMOTION))
-                hid_fixup_cymotion_descriptor(rdesc, rsize);
+        usbhid_fixup_report_descriptor(le16_to_cpu(dev->descriptor.idVendor),
+                        le16_to_cpu(dev->descriptor.idProduct), rdesc,
+                        rsize, rdesc_quirks_param);
 
-        if (quirks & HID_QUIRK_LOGITECH_DESCRIPTOR)
-                hid_fixup_logitech_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_SWAPPED_MIN_MAX)
-                hid_fixup_cypress_descriptor(rdesc, rsize);
-
-#ifdef CONFIG_HID_DEBUG
-        printk(KERN_DEBUG __FILE__ ": report descriptor (size %u, read %d) = ", rsize, n);
+        dbg_hid("report descriptor (size %u, read %d) = ", rsize, n);
         for (n = 0; n < rsize; n++)
-                printk(" %02x", (unsigned char) rdesc[n]);
-        printk("\n");
-#endif
+                dbg_hid_line(" %02x", (unsigned char) rdesc[n]);
+        dbg_hid_line("\n");
 
         if (!(hid = hid_parse_report(rdesc, n))) {
-                dbg("parsing report descriptor failed");
+                dbg_hid("parsing report descriptor failed\n");
                 kfree(rdesc);
                 return NULL;
         }
@@ -861,7 +806,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         }
 
         if (!usbhid->urbin) {
-                err("couldn't find an input interrupt endpoint");
+                err_hid("couldn't find an input interrupt endpoint");
                 goto fail;
         }
 
@@ -956,7 +901,7 @@ static void hid_disconnect(struct usb_interface *intf)
         usb_kill_urb(usbhid->urbctrl);
 
         del_timer_sync(&usbhid->io_retry);
-        flush_scheduled_work();
+        cancel_work_sync(&usbhid->reset_work);
 
         if (hid->claimed & HID_CLAIMED_INPUT)
                 hidinput_disconnect(hid);
@@ -978,7 +923,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         int i;
         char *c;
 
-        dbg("HID probe called for ifnum %d",
+        dbg_hid("HID probe called for ifnum %d\n",
                         intf->altsetting->desc.bInterfaceNumber);
 
         if (!(hid = usb_hid_configure(intf)))
diff --git a/drivers/hid/usbhid/hid-lgff.c b/drivers/hid/usbhid/hid-lgff.c
index c5cd4107d6af..4b7ab6a46d93 100644
--- a/drivers/hid/usbhid/hid-lgff.c
+++ b/drivers/hid/usbhid/hid-lgff.c
@@ -78,7 +78,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                 report->field[0]->value[1] = 0x08;
                 report->field[0]->value[2] = x;
                 report->field[0]->value[3] = y;
-                dbg("(x, y)=(%04x, %04x)", x, y);
+                dbg_hid("(x, y)=(%04x, %04x)\n", x, y);
                 usbhid_submit_report(hid, report, USB_DIR_OUT);
                 break;
 
@@ -93,7 +93,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                 report->field[0]->value[1] = 0x00;
                 report->field[0]->value[2] = left;
                 report->field[0]->value[3] = right;
-                dbg("(left, right)=(%04x, %04x)", left, right);
+                dbg_hid("(left, right)=(%04x, %04x)\n", left, right);
                 usbhid_submit_report(hid, report, USB_DIR_OUT);
                 break;
         }
@@ -113,20 +113,20 @@ int hid_lgff_init(struct hid_device* hid)
 
         /* Find the report to use */
         if (list_empty(report_list)) {
-                err("No output report found");
+                err_hid("No output report found");
                 return -1;
         }
 
         /* Check that the report looks ok */
         report = list_entry(report_list->next, struct hid_report, list);
         if (!report) {
-                err("NULL output report");
+                err_hid("NULL output report");
                 return -1;
         }
 
         field = report->field[0];
         if (!field) {
-                err("NULL field");
+                err_hid("NULL field");
                 return -1;
         }
 
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
index f5a90e950e6b..011326178c06 100644
--- a/drivers/hid/usbhid/hid-pidff.c
+++ b/drivers/hid/usbhid/hid-pidff.c
@@ -738,6 +738,7 @@ static void pidff_autocenter(struct pidff_device *pidff, u16 magnitude)
         pidff->set_effect[PID_TRIGGER_BUTTON].value[0] = 0;
         pidff->set_effect[PID_TRIGGER_REPEAT_INT].value[0] = 0;
         pidff_set(&pidff->set_effect[PID_GAIN], magnitude);
+        pidff->set_effect[PID_DIRECTION_ENABLE].value[0] = 1;
         pidff->set_effect[PID_START_DELAY].value[0] = 0;
 
         usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_EFFECT],
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index f6c4145dc202..775b9f3b8ce3 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -105,6 +105,9 @@
 #define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
 #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
 
+#define USB_VENDOR_ID_GAMERON           0x0810
+#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR  0x0001
+
 #define USB_VENDOR_ID_GLAB              0x06c2
 #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
 #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
@@ -196,8 +199,10 @@
 #define USB_VENDOR_ID_LOGITECH          0x046d
 #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
 #define USB_DEVICE_ID_LOGITECH_WHEEL    0xc294
+#define USB_DEVICE_ID_LOGITECH_KBD      0xc311
 #define USB_DEVICE_ID_S510_RECEIVER     0xc50c
 #define USB_DEVICE_ID_S510_RECEIVER_2   0xc517
+#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500   0xc512
 #define USB_DEVICE_ID_MX3000_RECEIVER   0xc513
 #define USB_DEVICE_ID_DINOVO_EDGE       0xc714
 
@@ -209,6 +214,13 @@
 #define USB_DEVICE_ID_MGE_UPS           0xffff
 #define USB_DEVICE_ID_MGE_UPS1          0x0001
 
+#define USB_VENDOR_ID_MICROSOFT         0x045e
+#define USB_DEVICE_ID_SIDEWINDER_GV     0x003b
+
+#define USB_VENDOR_ID_NCR               0x0404
+#define USB_DEVICE_ID_NCR_FIRST         0x0300
+#define USB_DEVICE_ID_NCR_LAST          0x03ff
+
 #define USB_VENDOR_ID_NEC               0x073e
 #define USB_DEVICE_ID_NEC_USB_GAME_PAD  0x0301
 
@@ -220,6 +232,9 @@
 #define USB_VENDOR_ID_PANTHERLORD       0x0810
 #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK     0x0001
 
+#define USB_VENDOR_ID_PETALYNX          0x18b1
+#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE    0x0037
+
 #define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
 #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
 
@@ -278,6 +293,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
+        { USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
@@ -285,11 +301,10 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
         
-        { USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_CYMOTION },
-
         { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },
 
         { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
+        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },
 
         { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10, HID_QUIRK_IGNORE },
@@ -409,9 +424,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },
 
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER, HID_QUIRK_LOGITECH_DESCRIPTOR },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER, HID_QUIRK_LOGITECH_DESCRIPTOR },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2, HID_QUIRK_LOGITECH_DESCRIPTOR },
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },
 
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },
 
@@ -426,6 +439,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
@@ -448,9 +462,28 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
 
         { USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS },
 
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_SWAPPED_MIN_MAX },
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_SWAPPED_MIN_MAX },
+        { 0, 0 }
+};
+
+/* Quirks for devices which require report descriptor fixup go here */
+static const struct hid_rdesc_blacklist {
+        __u16 idVendor;
+        __u16 idProduct;
+        __u32 quirks;
+} hid_rdesc_blacklist[] = {
+
+        { USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_RDESC_CYMOTION },
+
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER, HID_QUIRK_RDESC_LOGITECH },
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER, HID_QUIRK_RDESC_LOGITECH },
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2, HID_QUIRK_RDESC_LOGITECH },
+
+        { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_RDESC_PETALYNX },
+
+        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
+        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
 
         { 0, 0 }
 };
@@ -493,7 +526,7 @@ static struct hid_blacklist *usbhid_exists_dquirk(const u16 idVendor,
         }
 
         if (bl_entry != NULL)
-                dbg("Found dynamic quirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
+                dbg_hid("Found dynamic quirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
                                 bl_entry->quirks, bl_entry->idVendor,
                                 bl_entry->idProduct);
 
@@ -521,13 +554,13 @@ int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct,
         int list_edited = 0;
 
         if (!idVendor) {
-                dbg("Cannot add a quirk with idVendor = 0");
+                dbg_hid("Cannot add a quirk with idVendor = 0\n");
                 return -EINVAL;
         }
 
         q_new = kmalloc(sizeof(struct quirks_list_struct), GFP_KERNEL);
         if (!q_new) {
-                dbg("Could not allocate quirks_list_struct");
+                dbg_hid("Could not allocate quirks_list_struct\n");
                 return -ENOMEM;
         }
 
@@ -559,7 +592,6 @@ int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct,
         return 0;
 }
 
-
 /**
  * usbhid_remove_all_dquirks: remove all runtime HID quirks from memory
  *
@@ -643,7 +675,7 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
                         bl_entry = &hid_blacklist[n];
 
         if (bl_entry != NULL)
-                dbg("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
+                dbg_hid("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
                                 bl_entry->quirks, bl_entry->idVendor, 
                                 bl_entry->idProduct);
         return bl_entry;
@@ -675,6 +707,12 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)
                                 idProduct <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)
                         return HID_QUIRK_IGNORE;
 
+        /* NCR devices must not be queried for reports */
+        if (idVendor == USB_VENDOR_ID_NCR &&
+                        idProduct >= USB_DEVICE_ID_NCR_FIRST &&
+                        idProduct <= USB_DEVICE_ID_NCR_LAST)
+                        return HID_QUIRK_NOGET;
+
         down_read(&dquirks_rwsem);
         bl_entry = usbhid_exists_dquirk(idVendor, idProduct);
         if (!bl_entry)
@@ -686,3 +724,126 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)
         return quirks;
 }
 
+/*
+ * Cherry Cymotion keyboard have an invalid HID report descriptor,
+ * that needs fixing before we can parse it.
+ */
+static void usbhid_fixup_cymotion_descriptor(char *rdesc, int rsize)
+{
+        if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) {
+                printk(KERN_INFO "Fixing up Cherry Cymotion report descriptor\n");
+                rdesc[11] = rdesc[16] = 0xff;
+                rdesc[12] = rdesc[17] = 0x03;
+        }
+}
+
+
+/*
+ * Certain Logitech keyboards send in report #3 keys which are far
+ * above the logical maximum described in descriptor. This extends
+ * the original value of 0x28c of logical maximum to 0x104d
+ */
+static void usbhid_fixup_logitech_descriptor(unsigned char *rdesc, int rsize)
+{
+        if (rsize >= 90 && rdesc[83] == 0x26
+                        && rdesc[84] == 0x8c
+                        && rdesc[85] == 0x02) {
+                printk(KERN_INFO "Fixing up Logitech keyboard report descriptor\n");
+                rdesc[84] = rdesc[89] = 0x4d;
+                rdesc[85] = rdesc[90] = 0x10;
+        }
+}
+
+/* Petalynx Maxter Remote has maximum for consumer page set too low */
+static void usbhid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)
+{
+        if (rsize >= 60 && rdesc[39] == 0x2a
+                        && rdesc[40] == 0xf5
+                        && rdesc[41] == 0x00
+                        && rdesc[59] == 0x26
+                        && rdesc[60] == 0xf9
+                        && rdesc[61] == 0x00) {
+                printk(KERN_INFO "Fixing up Petalynx Maxter Remote report descriptor\n");
+                rdesc[60] = 0xfa;
+                rdesc[40] = 0xfa;
+        }
+}
+
+/*
+ * Some USB barcode readers from cypress have usage min and usage max in
+ * the wrong order
+ */
+static void usbhid_fixup_cypress_descriptor(unsigned char *rdesc, int rsize)
+{
+        short fixed = 0;
+        int i;
+
+        for (i = 0; i < rsize - 4; i++) {
+                if (rdesc[i] == 0x29 && rdesc [i+2] == 0x19) {
+                        unsigned char tmp;
+
+                        rdesc[i] = 0x19; rdesc[i+2] = 0x29;
+                        tmp = rdesc[i+3];
+                        rdesc[i+3] = rdesc[i+1];
+                        rdesc[i+1] = tmp;
+                }
+        }
+
+        if (fixed)
+                printk(KERN_INFO "Fixing up Cypress report descriptor\n");
+}
+
+
+static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
+{
+        if ((quirks & HID_QUIRK_RDESC_CYMOTION))
+                usbhid_fixup_cymotion_descriptor(rdesc, rsize);
+
+        if (quirks & HID_QUIRK_RDESC_LOGITECH)
+                usbhid_fixup_logitech_descriptor(rdesc, rsize);
+
+        if (quirks & HID_QUIRK_RDESC_SWAPPED_MIN_MAX)
+                usbhid_fixup_cypress_descriptor(rdesc, rsize);
+
+        if (quirks & HID_QUIRK_RDESC_PETALYNX)
+                usbhid_fixup_petalynx_descriptor(rdesc, rsize);
+}
+
+/**
+ * usbhid_fixup_report_descriptor: check if report descriptor needs fixup
+ *
+ * Description:
+ *      Walks the hid_rdesc_blacklist[] array and checks whether the device
+ *      is known to have broken report descriptor that needs to be fixed up
+ *      prior to entering the HID parser
+ *
+ * Returns: nothing
+ */
+void usbhid_fixup_report_descriptor(const u16 idVendor, const u16 idProduct,
+                                    char *rdesc, unsigned rsize, char **quirks_param)
+{
+        int n, m;
+        u16 paramVendor, paramProduct;
+        u32 quirks;
+
+        /* static rdesc quirk entries */
+        for (n = 0; hid_rdesc_blacklist[n].idVendor; n++)
+                if (hid_rdesc_blacklist[n].idVendor == idVendor &&
+                                hid_rdesc_blacklist[n].idProduct == idProduct)
+                        __usbhid_fixup_report_descriptor(hid_rdesc_blacklist[n].quirks,
+                                        rdesc, rsize);
+
+        /* runtime rdesc quirk entries handling */
+        for (n = 0; quirks_param[n] && n < MAX_USBHID_BOOT_QUIRKS; n++) {
+                m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%x",
+                                &paramVendor, &paramProduct, &quirks);
+
+                if (m != 3)
+                        printk(KERN_WARNING
+                                "Could not parse HID quirk module param %s\n",
+                                quirks_param[n]);
+                else if (paramVendor == idVendor && paramProduct == idProduct)
+                        __usbhid_fixup_report_descriptor(quirks, rdesc, rsize);
+        }
+
+}
diff --git a/drivers/hid/usbhid/hid-tmff.c b/drivers/hid/usbhid/hid-tmff.c
index ab5ba6ef891c..555bb48b4295 100644
--- a/drivers/hid/usbhid/hid-tmff.c
+++ b/drivers/hid/usbhid/hid-tmff.c
@@ -70,7 +70,7 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef
 
         tmff->rumble->value[0] = left;
         tmff->rumble->value[1] = right;
-        dbg("(left,right)=(%08x, %08x)", left, right);
+        dbg_hid("(left,right)=(%08x, %08x)\n", left, right);
         usbhid_submit_report(hid, tmff->report, USB_DIR_OUT);
 
         return 0;
diff --git a/drivers/hid/usbhid/hid-zpff.c b/drivers/hid/usbhid/hid-zpff.c
index a7fbffcdaf36..5a688274f6a3 100644
--- a/drivers/hid/usbhid/hid-zpff.c
+++ b/drivers/hid/usbhid/hid-zpff.c
@@ -21,10 +21,6 @@
  */
 
 
-/* #define DEBUG */
-
-#define debug(format, arg...) pr_debug("hid-zpff: " format "\n" , ## arg)
-
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
@@ -49,14 +45,14 @@ static int hid_zpff_play(struct input_dev *dev, void *data,
 
         left = effect->u.rumble.strong_magnitude;
         right = effect->u.rumble.weak_magnitude;
-        debug("called with 0x%04x 0x%04x", left, right);
+        dbg_hid("called with 0x%04x 0x%04x\n", left, right);
 
         left = left * 0x7f / 0xffff;
         right = right * 0x7f / 0xffff;
 
         zpff->report->field[2]->value[0] = left;
         zpff->report->field[3]->value[0] = right;
-        debug("running with 0x%02x 0x%02x", left, right);
+        dbg_hid("running with 0x%02x 0x%02x\n", left, right);
         usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
 
         return 0;
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 488d61bdbf2c..e793127f971e 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -779,7 +779,7 @@ int hiddev_connect(struct hid_device *hid)
 
         retval = usb_register_dev(usbhid->intf, &hiddev_class);
         if (retval) {
-                err("Not able to get a minor for this device.");
+                err_hid("Not able to get a minor for this device.");
                 kfree(hiddev);
                 return -1;
         }
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 130978780713..b76b02f7b52d 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -125,7 +125,7 @@ static void usb_kbd_irq(struct urb *urb)
 resubmit:
         i = usb_submit_urb (urb, GFP_ATOMIC);
         if (i)
-                err ("can't resubmit intr, %s-%s/input0, status %d",
+                err_hid ("can't resubmit intr, %s-%s/input0, status %d",
                                 kbd->usbdev->bus->bus_name,
                                 kbd->usbdev->devpath, i);
 }
@@ -151,7 +151,7 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type,
         *(kbd->leds) = kbd->newleds;
         kbd->led->dev = kbd->usbdev;
         if (usb_submit_urb(kbd->led, GFP_ATOMIC))
-                err("usb_submit_urb(leds) failed");
+                err_hid("usb_submit_urb(leds) failed");
 
         return 0;
 }
@@ -169,7 +169,7 @@ static void usb_kbd_led(struct urb *urb)
         *(kbd->leds) = kbd->newleds;
         kbd->led->dev = kbd->usbdev;
         if (usb_submit_urb(kbd->led, GFP_ATOMIC))
-                err("usb_submit_urb(leds) failed");
+                err_hid("usb_submit_urb(leds) failed");
 }
 
 static int usb_kbd_open(struct input_dev *dev)
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 66f826252aee..444a0b84f5bd 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -448,23 +448,21 @@ static int icside_dma_test_irq(ide_drive_t *drive)
                         ICS_ARCIN_V6_INTRSTAT_1)) & 1;
 }
 
-static int icside_dma_timeout(ide_drive_t *drive)
+static void icside_dma_timeout(ide_drive_t *drive)
 {
         printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
 
         if (icside_dma_test_irq(drive))
-                return 0;
+                return;
 
-        ide_dump_status(drive, "DMA timeout",
-                HWIF(drive)->INB(IDE_STATUS_REG));
+        ide_dump_status(drive, "DMA timeout", HWIF(drive)->INB(IDE_STATUS_REG));
 
-        return icside_dma_end(drive);
+        icside_dma_end(drive);
 }
 
-static int icside_dma_lostirq(ide_drive_t *drive)
+static void icside_dma_lost_irq(ide_drive_t *drive)
 {
         printk(KERN_ERR "%s: IRQ lost\n", drive->name);
-        return 1;
 }
 
 static void icside_dma_init(ide_hwif_t *hwif)
@@ -490,8 +488,8 @@ static void icside_dma_init(ide_hwif_t *hwif)
         hwif->dma_start         = icside_dma_start;
         hwif->ide_dma_end       = icside_dma_end;
         hwif->ide_dma_test_irq  = icside_dma_test_irq;
-        hwif->ide_dma_timeout   = icside_dma_timeout;
-        hwif->ide_dma_lostirq   = icside_dma_lostirq;
+        hwif->dma_timeout       = icside_dma_timeout;
+        hwif->dma_lost_irq      = icside_dma_lost_irq;
 
         hwif->drives[0].autodma = hwif->autodma;
         hwif->drives[1].autodma = hwif->autodma;
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index ca0341c05e55..886091bc7db0 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -819,7 +819,7 @@ init_e100_ide (void)
                 hwif->dma_host_off = &cris_dma_off;
                 hwif->dma_host_on = &cris_dma_on;
                 hwif->dma_off_quietly = &cris_dma_off;
-                hwif->udma_four = 0;
+                hwif->cbl = ATA_CBL_PATA40;
                 hwif->ultra_mask = cris_ultra_mask;
                 hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */
                 hwif->autodma = 1;
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 252ab8295edf..1486eb212ccc 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -481,7 +481,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
                 else
                         printk("  Unknown Error Type: ");
 
-                if (sense->sense_key < ARY_LEN(sense_key_texts))
+                if (sense->sense_key < ARRAY_SIZE(sense_key_texts))
                         s = sense_key_texts[sense->sense_key];
 
                 printk("%s -- (Sense key=0x%02x)\n", s, sense->sense_key);
@@ -491,7 +491,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
                                  sense->ascq);
                         s = buf;
                 } else {
-                        int lo = 0, mid, hi = ARY_LEN(sense_data_texts);
+                        int lo = 0, mid, hi = ARRAY_SIZE(sense_data_texts);
                         unsigned long key = (sense->sense_key << 16);
                         key |= (sense->asc << 8);
                         if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd))
@@ -524,7 +524,7 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
 
                 if (failed_command != NULL) {
 
-                        int lo=0, mid, hi= ARY_LEN (packet_command_texts);
+                        int lo=0, mid, hi= ARRAY_SIZE(packet_command_texts);
                         s = NULL;
 
                         while (hi > lo) {
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index ad1f2ed14a37..228b29c5d2e4 100644
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -498,8 +498,6 @@ struct cdrom_info {
  * Descriptions of ATAPI error codes.
  */
 
-#define ARY_LEN(a) ((sizeof(a) / sizeof(a[0])))
-
 /* This stuff should be in cdrom.h, since it is now generic... */
 
 /* ATAPI sense keys (from table 140 of ATAPI 2.6) */
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index dc2175c81f5e..b1304a7f3e0a 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1190,11 +1190,11 @@ static int idedisk_ioctl(struct inode *inode, struct file *file,
         return generic_ide_ioctl(drive, file, bdev, cmd, arg);
 
 read_val:
-        down(&ide_setting_sem);
+        mutex_lock(&ide_setting_mtx);
         spin_lock_irqsave(&ide_lock, flags);
         err = *val;
         spin_unlock_irqrestore(&ide_lock, flags);
-        up(&ide_setting_sem);
+        mutex_unlock(&ide_setting_mtx);
         return err >= 0 ? put_user(err, (long __user *)arg) : err;
 
 set_val:
@@ -1204,9 +1204,9 @@ set_val:
                 if (!capable(CAP_SYS_ADMIN))
                         err = -EACCES;
                 else {
-                        down(&ide_setting_sem);
+                        mutex_lock(&ide_setting_mtx);
                         err = setfunc(drive, arg);
-                        up(&ide_setting_sem);
+                        mutex_unlock(&ide_setting_mtx);
                 }
         }
         return err;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index ead141e2db9e..5fe1d72ab451 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -91,45 +91,45 @@
 
 static const struct drive_list_entry drive_whitelist [] = {
 
-        { "Micropolis 2112A"    ,       "ALL"           },
-        { "CONNER CTMA 4000"    ,       "ALL"           },
-        { "CONNER CTT8000-A"    ,       "ALL"           },
-        { "ST34342A"            ,       "ALL"           },
+        { "Micropolis 2112A"    ,       NULL            },
+        { "CONNER CTMA 4000"    ,       NULL            },
+        { "CONNER CTT8000-A"    ,       NULL            },
+        { "ST34342A"            ,       NULL            },
         { NULL                  ,       NULL            }
 };
 
 static const struct drive_list_entry drive_blacklist [] = {
 
-        { "WDC AC11000H"        ,       "ALL"           },
-        { "WDC AC22100H"        ,       "ALL"           },
-        { "WDC AC32500H"        ,       "ALL"           },
-        { "WDC AC33100H"        ,       "ALL"           },
-        { "WDC AC31600H"        ,       "ALL"           },
+        { "WDC AC11000H"        ,       NULL            },
+        { "WDC AC22100H"        ,       NULL            },
+        { "WDC AC32500H"        ,       NULL            },
+        { "WDC AC33100H"        ,       NULL            },
+        { "WDC AC31600H"        ,       NULL            },
         { "WDC AC32100H"        ,       "24.09P07"      },
         { "WDC AC23200L"        ,       "21.10N21"      },
-        { "Compaq CRD-8241B"    ,       "ALL"           },
-        { "CRD-8400B"           ,       "ALL"           },
-        { "CRD-8480B",                  "ALL"           },
-        { "CRD-8482B",                  "ALL"           },
-        { "CRD-84"              ,       "ALL"           },
-        { "SanDisk SDP3B"       ,       "ALL"           },
-        { "SanDisk SDP3B-64"    ,       "ALL"           },
-        { "SANYO CD-ROM CRD"    ,       "ALL"           },
-        { "HITACHI CDR-8"       ,       "ALL"           },
-        { "HITACHI CDR-8335"    ,       "ALL"           },
-        { "HITACHI CDR-8435"    ,       "ALL"           },
-        { "Toshiba CD-ROM XM-6202B"     ,       "ALL"           },
-        { "TOSHIBA CD-ROM XM-1702BC",   "ALL"           },
-        { "CD-532E-A"           ,       "ALL"           },
-        { "E-IDE CD-ROM CR-840",        "ALL"           },
-        { "CD-ROM Drive/F5A",   "ALL"           },
-        { "WPI CDD-820",                "ALL"           },
-        { "SAMSUNG CD-ROM SC-148C",     "ALL"           },
-        { "SAMSUNG CD-ROM SC",  "ALL"           },
-        { "ATAPI CD-ROM DRIVE 40X MAXIMUM",     "ALL"           },
-        { "_NEC DV5800A",               "ALL"           },  
+        { "Compaq CRD-8241B"    ,       NULL            },
+        { "CRD-8400B"           ,       NULL            },
+        { "CRD-8480B",                  NULL            },
+        { "CRD-8482B",                  NULL            },
+        { "CRD-84"              ,       NULL            },
+        { "SanDisk SDP3B"       ,       NULL            },
+        { "SanDisk SDP3B-64"    ,       NULL            },
+        { "SANYO CD-ROM CRD"    ,       NULL            },
+        { "HITACHI CDR-8"       ,       NULL            },
+        { "HITACHI CDR-8335"    ,       NULL            },
+        { "HITACHI CDR-8435"    ,       NULL            },
+        { "Toshiba CD-ROM XM-6202B"     ,       NULL            },
+        { "TOSHIBA CD-ROM XM-1702BC",   NULL            },
+        { "CD-532E-A"           ,       NULL            },
+        { "E-IDE CD-ROM CR-840",        NULL            },
+        { "CD-ROM Drive/F5A",   NULL            },
+        { "WPI CDD-820",                NULL            },
+        { "SAMSUNG CD-ROM SC-148C",     NULL            },
+        { "SAMSUNG CD-ROM SC",  NULL            },
+        { "ATAPI CD-ROM DRIVE 40X MAXIMUM",     NULL            },
+        { "_NEC DV5800A",               NULL            },
         { "SAMSUNG CD-ROM SN-124",      "N001" },
-        { "Seagate STT20000A",          "ALL" },
+        { "Seagate STT20000A",          NULL  },
         { NULL                  ,       NULL            }
 
 };
@@ -147,8 +147,8 @@ int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *driv
 {
         for ( ; drive_table->id_model ; drive_table++)
                 if ((!strcmp(drive_table->id_model, id->model)) &&
-                    ((strstr(id->fw_rev, drive_table->id_firmware)) ||
-                     (!strcmp(drive_table->id_firmware, "ALL"))))
+                    (!drive_table->id_firmware ||
+                     strstr(id->fw_rev, drive_table->id_firmware)))
                         return 1;
         return 0;
 }
@@ -702,8 +702,22 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base)
                         mask = id->dma_mword & hwif->mwdma_mask;
                 break;
         case XFER_SW_DMA_0:
-                if (id->field_valid & 2)
+                if (id->field_valid & 2) {
                         mask = id->dma_1word & hwif->swdma_mask;
+                } else if (id->tDMA) {
+                        /*
+                         * ide_fix_driveid() doesn't convert ->tDMA to the
+                         * CPU endianness so we need to do it here
+                         */
+                        u8 mode = le16_to_cpu(id->tDMA);
+
+                        /*
+                         * if the mode is valid convert it to the mask
+                         * (the maximum allowed mode is XFER_SW_DMA_2)
+                         */
+                        if (mode <= 2)
+                                mask = ((2 << mode) - 1) & hwif->swdma_mask;
+                }
                 break;
         default:
                 BUG();
@@ -847,27 +861,27 @@ int ide_set_dma(ide_drive_t *drive)
         return rc;
 }
 
-EXPORT_SYMBOL_GPL(ide_set_dma);
-
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
-int __ide_dma_lostirq (ide_drive_t *drive)
+void ide_dma_lost_irq (ide_drive_t *drive)
 {
         printk("%s: DMA interrupt recovery\n", drive->name);
-        return 1;
 }
 
-EXPORT_SYMBOL(__ide_dma_lostirq);
+EXPORT_SYMBOL(ide_dma_lost_irq);
 
-int __ide_dma_timeout (ide_drive_t *drive)
+void ide_dma_timeout (ide_drive_t *drive)
 {
+        ide_hwif_t *hwif = HWIF(drive);
+
         printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
-        if (HWIF(drive)->ide_dma_test_irq(drive))
-                return 0;
 
-        return HWIF(drive)->ide_dma_end(drive);
+        if (hwif->ide_dma_test_irq(drive))
+                return;
+
+        hwif->ide_dma_end(drive);
 }
 
-EXPORT_SYMBOL(__ide_dma_timeout);
+EXPORT_SYMBOL(ide_dma_timeout);
 
 /*
  * Needed for allowing full modular support of ide-driver
@@ -1018,10 +1032,10 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
                 hwif->ide_dma_end = &__ide_dma_end;
         if (!hwif->ide_dma_test_irq)
                 hwif->ide_dma_test_irq = &__ide_dma_test_irq;
-        if (!hwif->ide_dma_timeout)
-                hwif->ide_dma_timeout = &__ide_dma_timeout;
-        if (!hwif->ide_dma_lostirq)
-                hwif->ide_dma_lostirq = &__ide_dma_lostirq;
+        if (!hwif->dma_timeout)
+                hwif->dma_timeout = &ide_dma_timeout;
+        if (!hwif->dma_lost_irq)
+                hwif->dma_lost_irq = &ide_dma_lost_irq;
 
         if (hwif->chipset != ide_trm290) {
                 u8 dma_stat = hwif->INB(hwif->dma_status);
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index bfe8f1b712ba..c5b5011da56e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1350,7 +1350,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
                                                 hwif->INB(IDE_STATUS_REG));
         } else {
                 printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
-                (void) hwif->ide_dma_timeout(drive);
+                hwif->dma_timeout(drive);
         }
 
         /*
@@ -1466,7 +1466,7 @@ void ide_timer_expiry (unsigned long data)
                                 startstop = handler(drive);
                         } else if (drive_is_ready(drive)) {
                                 if (drive->waiting_for_dma)
-                                        (void) hwgroup->hwif->ide_dma_lostirq(drive);
+                                        hwgroup->hwif->dma_lost_irq(drive);
                                 (void)ide_ack_intr(hwif);
                                 printk(KERN_WARNING "%s: lost interrupt\n", drive->name);
                                 startstop = handler(drive);
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index f0be5f665a0e..92578b6832e9 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -574,7 +574,10 @@ u8 eighty_ninty_three (ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         struct hd_driveid *id = drive->id;
 
-        if (hwif->udma_four == 0)
+        if (hwif->cbl == ATA_CBL_PATA40_SHORT)
+                return 1;
+
+        if (hwif->cbl != ATA_CBL_PATA80)
                 goto no_80w;
 
         /* Check for SATA but only if we are ATA5 or higher */
@@ -600,7 +603,8 @@ no_80w:
 
         printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, "
                             "limiting max speed to UDMA33\n",
-                            drive->name, hwif->udma_four ? "drive" : "host");
+                            drive->name,
+                            hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host");
 
         drive->udma33_warned = 1;
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f5ce22c38f82..cc5801399467 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -144,7 +144,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
         local_irq_enable();
         ide_fix_driveid(id);
 
-#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
+#if defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
         /*
          * EATA SCSI controllers do a hardware ATA emulation:
          * Ignore them if there is a driver for them available.
@@ -154,7 +154,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
                 printk("%s: EATA SCSI HBA %.10s\n", drive->name, id->model);
                 goto err_misc;
         }
-#endif /* CONFIG_SCSI_EATA_DMA || CONFIG_SCSI_EATA_PIO */
+#endif /* CONFIG_SCSI_EATA || CONFIG_SCSI_EATA_PIO */
 
         /*
          *  WIN_IDENTIFY returns little-endian info,
@@ -1025,7 +1025,7 @@ static int init_irq (ide_hwif_t *hwif)
         BUG_ON(irqs_disabled());        
         BUG_ON(hwif == NULL);
 
-        down(&ide_cfg_sem);
+        mutex_lock(&ide_cfg_mtx);
         hwif->hwgroup = NULL;
 #if MAX_HWIFS > 1
         /*
@@ -1154,7 +1154,7 @@ static int init_irq (ide_hwif_t *hwif)
                 printk(" (%sed with %s)",
                         hwif->sharing_irq ? "shar" : "serializ", match->name);
         printk("\n");
-        up(&ide_cfg_sem);
+        mutex_unlock(&ide_cfg_mtx);
         return 0;
 out_unlink:
         spin_lock_irq(&ide_lock);
@@ -1177,7 +1177,7 @@ out_unlink:
         }
         spin_unlock_irq(&ide_lock);
 out_up:
-        up(&ide_cfg_sem);
+        mutex_unlock(&ide_cfg_mtx);
         return 1;
 }
 
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index ea94c9aa1220..fc1d8ae6a803 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -156,7 +156,7 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int d
 {
         ide_settings_t **p = (ide_settings_t **) &drive->settings, *setting = NULL;
 
-        down(&ide_setting_sem);
+        mutex_lock(&ide_setting_mtx);
         while ((*p) && strcmp((*p)->name, name) < 0)
                 p = &((*p)->next);
         if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
@@ -177,10 +177,10 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int d
         if (auto_remove)
                 setting->auto_remove = 1;
         *p = setting;
-        up(&ide_setting_sem);
+        mutex_unlock(&ide_setting_mtx);
         return 0;
 abort:
-        up(&ide_setting_sem);
+        mutex_unlock(&ide_setting_mtx);
         kfree(setting);
         return -1;
 }
@@ -224,7 +224,7 @@ static void __ide_remove_setting (ide_drive_t *drive, char *name)
  *
  *      Automatically remove all the driver specific settings for this
  *      drive. This function may not be called from IRQ context. The
- *      caller must hold ide_setting_sem.
+ *      caller must hold ide_setting_mtx.
  */
 
 static void auto_remove_settings (ide_drive_t *drive)
@@ -269,7 +269,7 @@ static ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name)
  *      @setting: drive setting
  *
  *      Read a drive setting and return the value. The caller
- *      must hold the ide_setting_sem when making this call.
+ *      must hold the ide_setting_mtx when making this call.
  *
  *      BUGS: the data return and error are the same return value
  *      so an error -EINVAL and true return of the same value cannot
@@ -306,7 +306,7 @@ static int ide_read_setting(ide_drive_t *drive, ide_settings_t *setting)
  *      @val: value
  *
  *      Write a drive setting if it is possible. The caller
- *      must hold the ide_setting_sem when making this call.
+ *      must hold the ide_setting_mtx when making this call.
  *
  *      BUGS: the data return and error are the same return value
  *      so an error -EINVAL and true return of the same value cannot
@@ -367,7 +367,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg)
  *      @drive: drive being configured
  *
  *      Add the generic parts of the system settings to the /proc files.
- *      The caller must not be holding the ide_setting_sem.
+ *      The caller must not be holding the ide_setting_mtx.
  */
 
 void ide_add_generic_settings (ide_drive_t *drive)
@@ -408,7 +408,7 @@ static int proc_ide_read_settings
 
         proc_ide_settings_warn();
 
-        down(&ide_setting_sem);
+        mutex_lock(&ide_setting_mtx);
         out += sprintf(out, "name\t\t\tvalue\t\tmin\t\tmax\t\tmode\n");
         out += sprintf(out, "----\t\t\t-----\t\t---\t\t---\t\t----\n");
         while(setting) {
@@ -428,7 +428,7 @@ static int proc_ide_read_settings
                 setting = setting->next;
         }
         len = out - page;
-        up(&ide_setting_sem);
+        mutex_unlock(&ide_setting_mtx);
         PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
 }
 
@@ -508,16 +508,16 @@ static int proc_ide_write_settings(struct file *file, const char __user *buffer,
                                 ++p;
                         }
 
-                        down(&ide_setting_sem);
+                        mutex_lock(&ide_setting_mtx);
                         setting = ide_find_setting_by_name(drive, name);
                         if (!setting)
                         {
-                                up(&ide_setting_sem);
+                                mutex_unlock(&ide_setting_mtx);
                                 goto parse_error;
                         }
                         if (for_real)
                                 ide_write_setting(drive, setting, val * setting->div_factor / setting->mul_factor);
-                        up(&ide_setting_sem);
+                        mutex_unlock(&ide_setting_mtx);
                 }
         } while (!for_real++);
         free_page((unsigned long)buf);
@@ -705,7 +705,7 @@ EXPORT_SYMBOL(ide_proc_register_driver);
  *      Clean up the driver specific /proc files and IDE settings
  *      for a given drive.
  *
- *      Takes ide_setting_sem and ide_lock.
+ *      Takes ide_setting_mtx and ide_lock.
  *      Caller must hold none of the locks.
  */
 
@@ -715,10 +715,10 @@ void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver)
 
         ide_remove_proc_entries(drive->proc, driver->proc);
 
-        down(&ide_setting_sem);
+        mutex_lock(&ide_setting_mtx);
         spin_lock_irqsave(&ide_lock, flags);
         /*
-         * ide_setting_sem protects the settings list
+         * ide_setting_mtx protects the settings list
          * ide_lock protects the use of settings
          *
          * so we need to hold both, ide_settings_sem because we want to
@@ -726,11 +726,11 @@ void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver)
          * a setting out that is being used.
          *
          * OTOH both ide_{read,write}_setting are only ever used under
-         * ide_setting_sem.
+         * ide_setting_mtx.
          */
         auto_remove_settings(drive);
         spin_unlock_irqrestore(&ide_lock, flags);
-        up(&ide_setting_sem);
+        mutex_unlock(&ide_setting_mtx);
 }
 
 EXPORT_SYMBOL(ide_proc_unregister_driver);
diff --git a/drivers/ide/ide-timing.h b/drivers/ide/ide-timing.h
index c0864b1e9228..e6cb8593b5ba 100644
--- a/drivers/ide/ide-timing.h
+++ b/drivers/ide/ide-timing.h
@@ -102,66 +102,16 @@ static struct ide_timing ide_timing[] = {
 #define EZ(v,unit)              ((v)?ENOUGH(v,unit):0)
 
 #define XFER_MODE       0xf0
-#define XFER_UDMA_133   0x48
-#define XFER_UDMA_100   0x44
-#define XFER_UDMA_66    0x42
-#define XFER_UDMA       0x40
 #define XFER_MWDMA      0x20
-#define XFER_SWDMA      0x10
 #define XFER_EPIO       0x01
 #define XFER_PIO        0x00
 
-static short ide_find_best_mode(ide_drive_t *drive, int map)
+static short ide_find_best_pio_mode(ide_drive_t *drive)
 {
         struct hd_driveid *id = drive->id;
         short best = 0;
 
-        if (!id)
-                return XFER_PIO_SLOW;
-
-        if ((map & XFER_UDMA) && (id->field_valid & 4)) {       /* Want UDMA and UDMA bitmap valid */
-
-                if ((map & XFER_UDMA_133) == XFER_UDMA_133)
-                        if ((best = (id->dma_ultra & 0x0040) ? XFER_UDMA_6 : 0)) return best;
-
-                if ((map & XFER_UDMA_100) == XFER_UDMA_100)
-                        if ((best = (id->dma_ultra & 0x0020) ? XFER_UDMA_5 : 0)) return best;
-
-                if ((map & XFER_UDMA_66) == XFER_UDMA_66)
-                        if ((best = (id->dma_ultra & 0x0010) ? XFER_UDMA_4 :
-                                    (id->dma_ultra & 0x0008) ? XFER_UDMA_3 : 0)) return best;
-
-                if ((best = (id->dma_ultra & 0x0004) ? XFER_UDMA_2 :
-                            (id->dma_ultra & 0x0002) ? XFER_UDMA_1 :
-                            (id->dma_ultra & 0x0001) ? XFER_UDMA_0 : 0)) return best;
-        }
-
-        if ((map & XFER_MWDMA) && (id->field_valid & 2)) {      /* Want MWDMA and drive has EIDE fields */
-
-                if ((best = (id->dma_mword & 0x0004) ? XFER_MW_DMA_2 :
-                            (id->dma_mword & 0x0002) ? XFER_MW_DMA_1 :
-                            (id->dma_mword & 0x0001) ? XFER_MW_DMA_0 : 0)) return best;
-        }
-
-        if (map & XFER_SWDMA) {                                 /* Want SWDMA */
-
-                if (id->field_valid & 2) {                      /* EIDE SWDMA */
-
-                        if ((best = (id->dma_1word & 0x0004) ? XFER_SW_DMA_2 :
-                                    (id->dma_1word & 0x0002) ? XFER_SW_DMA_1 :
-                                    (id->dma_1word & 0x0001) ? XFER_SW_DMA_0 : 0)) return best;
-                }
-
-                if (id->capability & 1) {                       /* Pre-EIDE style SWDMA */
-
-                        if ((best = (id->tDMA == 2) ? XFER_SW_DMA_2 :
-                                    (id->tDMA == 1) ? XFER_SW_DMA_1 :
-                                    (id->tDMA == 0) ? XFER_SW_DMA_0 : 0)) return best;
-                }
-        }
-
-
-        if ((map & XFER_EPIO) && (id->field_valid & 2)) {       /* EIDE PIO modes */
+        if (id->field_valid & 2) {      /* EIDE PIO modes */
 
                 if ((best = (drive->id->eide_pio_modes & 4) ? XFER_PIO_5 :
                             (drive->id->eide_pio_modes & 2) ? XFER_PIO_4 :
@@ -262,7 +212,7 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing
  */
 
         if ((speed & XFER_MODE) != XFER_PIO) {
-                ide_timing_compute(drive, ide_find_best_mode(drive, XFER_PIO | XFER_EPIO), &p, T, UT);
+                ide_timing_compute(drive, ide_find_best_pio_mode(drive), &p, T, UT);
                 ide_timing_merge(&p, t, t, IDE_TIMING_ALL);
         }
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 0cd76bf66833..c948a5c17a5d 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -169,7 +169,7 @@ static const u8 ide_hwif_to_major[] = { IDE0_MAJOR, IDE1_MAJOR,
 static int idebus_parameter;    /* holds the "idebus=" parameter */
 static int system_bus_speed;    /* holds what we think is VESA/PCI bus speed */
 
-DECLARE_MUTEX(ide_cfg_sem);
+DEFINE_MUTEX(ide_cfg_mtx);
  __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);
 
 #ifdef CONFIG_IDEPCI_PCIBUS_ORDER
@@ -460,6 +460,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->mwdma_mask                = tmp_hwif->mwdma_mask;
         hwif->swdma_mask                = tmp_hwif->swdma_mask;
 
+        hwif->cbl                       = tmp_hwif->cbl;
+
         hwif->chipset                   = tmp_hwif->chipset;
         hwif->hold                      = tmp_hwif->hold;
 
@@ -496,8 +498,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->ide_dma_clear_irq         = tmp_hwif->ide_dma_clear_irq;
         hwif->dma_host_on               = tmp_hwif->dma_host_on;
         hwif->dma_host_off              = tmp_hwif->dma_host_off;
-        hwif->ide_dma_lostirq           = tmp_hwif->ide_dma_lostirq;
-        hwif->ide_dma_timeout           = tmp_hwif->ide_dma_timeout;
+        hwif->dma_lost_irq              = tmp_hwif->dma_lost_irq;
+        hwif->dma_timeout               = tmp_hwif->dma_timeout;
 
         hwif->OUTB                      = tmp_hwif->OUTB;
         hwif->OUTBSYNC                  = tmp_hwif->OUTBSYNC;
@@ -533,7 +535,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->extra_base                = tmp_hwif->extra_base;
         hwif->extra_ports               = tmp_hwif->extra_ports;
         hwif->autodma                   = tmp_hwif->autodma;
-        hwif->udma_four                 = tmp_hwif->udma_four;
 
         hwif->hwif_data                 = tmp_hwif->hwif_data;
 }
@@ -564,7 +565,7 @@ void ide_unregister(unsigned int index)
 {
         ide_drive_t *drive;
         ide_hwif_t *hwif, *g;
-        static ide_hwif_t tmp_hwif; /* protected by ide_cfg_sem */
+        static ide_hwif_t tmp_hwif; /* protected by ide_cfg_mtx */
         ide_hwgroup_t *hwgroup;
         int irq_count = 0, unit;
 
@@ -572,7 +573,7 @@ void ide_unregister(unsigned int index)
 
         BUG_ON(in_interrupt());
         BUG_ON(irqs_disabled());
-        down(&ide_cfg_sem);
+        mutex_lock(&ide_cfg_mtx);
         spin_lock_irq(&ide_lock);
         hwif = &ide_hwifs[index];
         if (!hwif->present)
@@ -679,7 +680,7 @@ void ide_unregister(unsigned int index)
 
 abort:
         spin_unlock_irq(&ide_lock);
-        up(&ide_cfg_sem);
+        mutex_unlock(&ide_cfg_mtx);
 }
 
 EXPORT_SYMBOL(ide_unregister);
@@ -817,9 +818,9 @@ EXPORT_SYMBOL(ide_register_hw);
  *      Locks for IDE setting functionality
  */
 
-DECLARE_MUTEX(ide_setting_sem);
+DEFINE_MUTEX(ide_setting_mtx);
 
-EXPORT_SYMBOL_GPL(ide_setting_sem);
+EXPORT_SYMBOL_GPL(ide_setting_mtx);
 
 /**
  *      ide_spin_wait_hwgroup   -       wait for group
@@ -1192,11 +1193,11 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
         }
 
 read_val:
-        down(&ide_setting_sem);
+        mutex_lock(&ide_setting_mtx);
         spin_lock_irqsave(&ide_lock, flags);
         err = *val;
         spin_unlock_irqrestore(&ide_lock, flags);
-        up(&ide_setting_sem);
+        mutex_unlock(&ide_setting_mtx);
         return err >= 0 ? put_user(err, (long __user *)arg) : err;
 
 set_val:
@@ -1206,9 +1207,9 @@ set_val:
                 if (!capable(CAP_SYS_ADMIN))
                         err = -EACCES;
                 else {
-                        down(&ide_setting_sem);
+                        mutex_lock(&ide_setting_mtx);
                         err = setfunc(drive, arg);
-                        up(&ide_setting_sem);
+                        mutex_unlock(&ide_setting_mtx);
                 }
         }
         return err;
@@ -1548,7 +1549,11 @@ static int __init ide_setup(char *s)
                                 goto bad_option;
                         case -7: /* ata66 */
 #ifdef CONFIG_BLK_DEV_IDEPCI
-                                hwif->udma_four = 1;
+                                /*
+                                 * Use ATA_CBL_PATA40_SHORT so drive side
+                                 * cable detection is also overriden.
+                                 */
+                                hwif->cbl = ATA_CBL_PATA40_SHORT;
                                 goto obsolete_option;
 #else
                                 goto bad_hwif;
diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c
index 45ed03591cd8..661c12f6dda6 100644
--- a/drivers/ide/legacy/hd.c
+++ b/drivers/ide/legacy/hd.c
@@ -130,7 +130,7 @@ struct hd_i_struct {
         
 #ifdef HD_TYPE
 static struct hd_i_struct hd_info[] = { HD_TYPE };
-static int NR_HD = ((sizeof (hd_info))/(sizeof (struct hd_i_struct)));
+static int NR_HD = ARRAY_SIZE(hd_info);
 #else
 static struct hd_i_struct hd_info[MAX_HD];
 static int NR_HD;
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index c211fc78345d..b557c45a5a9d 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -77,15 +77,6 @@ int macide_ack_intr(ide_hwif_t* hwif)
         return 0;
 }
 
-#ifdef CONFIG_BLK_DEV_MAC_MEDIABAY
-static void macide_mediabay_interrupt(int irq, void *dev_id)
-{
-        int state = baboon->mb_status & 0x04;
-
-        printk(KERN_INFO "macide: media bay %s detected\n", state? "removal":"insertion");
-}
-#endif
-
 /*
  * Probe for a Macintosh IDE interface
  */
@@ -128,11 +119,6 @@ void macide_init(void)
                         ide_drive_t *drive = &ide_hwifs[index].drives[0];
                         drive->capacity64 = drive->cyl*drive->head*drive->sect;
 
-#ifdef CONFIG_BLK_DEV_MAC_MEDIABAY
-                        request_irq(IRQ_BABOON_2, macide_mediabay_interrupt,
-                                        IRQ_FLG_FAST, "mediabay",
-                                        macide_mediabay_interrupt);
-#endif
                 }
                 break;
 
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index ca95e990862e..2e7013a2a7f6 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -381,9 +381,7 @@ static int auide_dma_setup(ide_drive_t *drive)
 
 static int auide_dma_check(ide_drive_t *drive)
 {
-        u8 speed;
-
-#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
+        u8 speed = ide_max_dma_mode(drive);
 
         if( dbdma_init_done == 0 ){
                 auide_hwif.white_list = ide_in_drive_list(drive->id,
@@ -394,7 +392,6 @@ static int auide_dma_check(ide_drive_t *drive)
                 auide_ddma_init(&auide_hwif);
                 dbdma_init_done = 1;
         }
-#endif
 
         /* Is the drive in our DMA black list? */
 
@@ -409,8 +406,6 @@ static int auide_dma_check(ide_drive_t *drive)
         else
                 drive->using_dma = 1;
 
-        speed = ide_find_best_mode(drive, XFER_PIO | XFER_MWDMA);
-        
         if (drive->autodma && (speed & XFER_MODE) != XFER_PIO)
                 return 0;
 
@@ -456,10 +451,9 @@ static void auide_dma_off_quietly(ide_drive_t *drive)
         drive->using_dma = 0;
 }
 
-static int auide_dma_lostirq(ide_drive_t *drive)
+static void auide_dma_lost_irq(ide_drive_t *drive)
 {
         printk(KERN_ERR "%s: IRQ lost\n", drive->name);
-        return 0;
 }
 
 static void auide_ddma_tx_callback(int irq, void *param)
@@ -489,16 +483,16 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de
   
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
 
-static int auide_dma_timeout(ide_drive_t *drive)
+static void auide_dma_timeout(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        ide_hwif_t *hwif = HWIF(drive);
 
         printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
 
-        if (HWIF(drive)->ide_dma_test_irq(drive))
-                return 0;
+        if (hwif->ide_dma_test_irq(drive))
+                return;
 
-        return HWIF(drive)->ide_dma_end(drive);
+        hwif->ide_dma_end(drive);
 }
                                         
 
@@ -721,7 +715,7 @@ static int au_ide_probe(struct device *dev)
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
         hwif->dma_off_quietly           = &auide_dma_off_quietly;
-        hwif->ide_dma_timeout           = &auide_dma_timeout;
+        hwif->dma_timeout               = &auide_dma_timeout;
 
         hwif->ide_dma_check             = &auide_dma_check;
         hwif->dma_exec_cmd              = &auide_dma_exec_cmd;
@@ -731,7 +725,7 @@ static int au_ide_probe(struct device *dev)
         hwif->ide_dma_test_irq          = &auide_dma_test_irq;
         hwif->dma_host_off              = &auide_dma_host_off;
         hwif->dma_host_on               = &auide_dma_host_on;
-        hwif->ide_dma_lostirq           = &auide_dma_lostirq;
+        hwif->dma_lost_irq              = &auide_dma_lost_irq;
         hwif->ide_dma_on                = &auide_dma_on;
 
         hwif->autodma                   = 1;
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index b173bc66ce1e..e5d09367627e 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/aec62xx.c              Version 0.21    Apr 21, 2007
+ * linux/drivers/ide/pci/aec62xx.c              Version 0.24    May 24, 2007
  *
  * Copyright (C) 1999-2002      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2007           MontaVista Software, Inc. <source@mvista.com>
@@ -140,25 +140,10 @@ static int aec6260_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         return(ide_config_drive_speed(drive, speed));
 }
 
-static int aec62xx_tune_chipset (ide_drive_t *drive, u8 speed)
-{
-        switch (HWIF(drive)->pci_dev->device) {
-                case PCI_DEVICE_ID_ARTOP_ATP865:
-                case PCI_DEVICE_ID_ARTOP_ATP865R:
-                case PCI_DEVICE_ID_ARTOP_ATP860:
-                case PCI_DEVICE_ID_ARTOP_ATP860R:
-                        return ((int) aec6260_tune_chipset(drive, speed));
-                case PCI_DEVICE_ID_ARTOP_ATP850UF:
-                        return ((int) aec6210_tune_chipset(drive, speed));
-                default:
-                        return -1;
-        }
-}
-
 static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
 {
         pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
-        (void) aec62xx_tune_chipset(drive, pio + XFER_PIO_0);
+        (void) HWIF(drive)->speedproc(drive, pio + XFER_PIO_0);
 }
 
 static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
@@ -172,12 +157,9 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
         return -1;
 }
 
-static int aec62xx_irq_timeout (ide_drive_t *drive)
+static void aec62xx_dma_lost_irq (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
-
-        switch(dev->device) {
+        switch (HWIF(drive)->pci_dev->device) {
                 case PCI_DEVICE_ID_ARTOP_ATP860:
                 case PCI_DEVICE_ID_ARTOP_ATP860R:
                 case PCI_DEVICE_ID_ARTOP_ATP865:
@@ -186,7 +168,6 @@ static int aec62xx_irq_timeout (ide_drive_t *drive)
                 default:
                         break;
         }
-        return 0;
 }
 
 static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)
@@ -224,64 +205,46 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
 
 static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev     = hwif->pci_dev;
+        u8 reg54 = 0,  mask     = hwif->channel ? 0xf0 : 0x0f;
+        unsigned long flags;
 
-        hwif->autodma = 0;
         hwif->tuneproc = &aec62xx_tune_drive;
-        hwif->speedproc = &aec62xx_tune_chipset;
 
-        if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
-                hwif->serialized = hwif->channel;
-
-        if (hwif->mate)
-                hwif->mate->serialized = hwif->serialized;
+        if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
+                if(hwif->mate)
+                        hwif->mate->serialized = hwif->serialized = 1;
+                hwif->speedproc = &aec6210_tune_chipset;
+        } else
+                hwif->speedproc = &aec6260_tune_chipset;
 
         if (!hwif->dma_base) {
-                hwif->drives[0].autotune = 1;
-                hwif->drives[1].autotune = 1;
+                hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
                 return;
         }
 
         hwif->ultra_mask = hwif->cds->udma_mask;
-
-        /* atp865 and atp865r */
-        if (hwif->ultra_mask == 0x3f) {
-                /* check bit 0x10 of DMA status register */
-                if (inb(pci_resource_start(dev, 4) + 2) & 0x10)
-                        hwif->ultra_mask = 0x7f; /* udma0-6 */
-        }
-
         hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check     = &aec62xx_config_drive_xfer_rate;
-        hwif->ide_dma_lostirq   = &aec62xx_irq_timeout;
-
-        if (!noautodma)
-                hwif->autodma = 1;
-        hwif->drives[0].autodma = hwif->autodma;
-        hwif->drives[1].autodma = hwif->autodma;
-}
-
-static void __devinit init_dma_aec62xx(ide_hwif_t *hwif, unsigned long dmabase)
-{
-        struct pci_dev *dev     = hwif->pci_dev;
+        hwif->dma_lost_irq      = &aec62xx_dma_lost_irq;
 
         if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
-                u8 reg54h = 0;
-                unsigned long flags;
-
                 spin_lock_irqsave(&ide_lock, flags);
-                pci_read_config_byte(dev, 0x54, &reg54h);
-                pci_write_config_byte(dev, 0x54, reg54h & ~(hwif->channel ? 0xF0 : 0x0F));
+                pci_read_config_byte (dev, 0x54, &reg54);
+                pci_write_config_byte(dev, 0x54, (reg54 & ~mask));
                 spin_unlock_irqrestore(&ide_lock, flags);
-        } else {
-                u8 ata66        = 0;
+        } else if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
+                u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
+
                 pci_read_config_byte(hwif->pci_dev, 0x49, &ata66);
-                if (!(hwif->udma_four))
-                        hwif->udma_four = (ata66&(hwif->channel?0x02:0x01))?0:1;
+
+                hwif->cbl = (ata66 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
         }
 
-        ide_setup_dma(hwif, dmabase, 8);
+        if (!noautodma)
+                hwif->autodma = 1;
+        hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
 }
 
 static int __devinit init_setup_aec62xx(struct pci_dev *dev, ide_pci_device_t *d)
@@ -291,16 +254,12 @@ static int __devinit init_setup_aec62xx(struct pci_dev *dev, ide_pci_device_t *d
 
 static int __devinit init_setup_aec6x80(struct pci_dev *dev, ide_pci_device_t *d)
 {
-        unsigned long bar4reg = pci_resource_start(dev, 4);
-
-        if (inb(bar4reg+2) & 0x10) {
-                strcpy(d->name, "AEC6880");
-                if (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R)
-                        strcpy(d->name, "AEC6880R");
-        } else {
-                strcpy(d->name, "AEC6280");
-                if (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R)
-                        strcpy(d->name, "AEC6280R");
+        unsigned long dma_base = pci_resource_start(dev, 4);
+
+        if (inb(dma_base + 2) & 0x10) {
+                d->name = (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R) ?
+                          "AEC6880R" : "AEC6880";
+                d->udma_mask = 0x7f; /* udma0-6 */
         }
 
         return ide_setup_pci_device(dev, d);
@@ -312,7 +271,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_setup     = init_setup_aec62xx,
                 .init_chipset   = init_chipset_aec62xx,
                 .init_hwif      = init_hwif_aec62xx,
-                .init_dma       = init_dma_aec62xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
@@ -323,7 +281,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_setup     = init_setup_aec62xx,
                 .init_chipset   = init_chipset_aec62xx,
                 .init_hwif      = init_hwif_aec62xx,
-                .init_dma       = init_dma_aec62xx,
                 .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = OFF_BOARD,
@@ -333,28 +290,25 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_setup     = init_setup_aec62xx,
                 .init_chipset   = init_chipset_aec62xx,
                 .init_hwif      = init_hwif_aec62xx,
-                .init_dma       = init_dma_aec62xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = NEVER_BOARD,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
-                .name           = "AEC6X80",
+                .name           = "AEC6280",
                 .init_setup     = init_setup_aec6x80,
                 .init_chipset   = init_chipset_aec62xx,
                 .init_hwif      = init_hwif_aec62xx,
-                .init_dma       = init_dma_aec62xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 4 */
-                .name           = "AEC6X80R",
+                .name           = "AEC6280R",
                 .init_setup     = init_setup_aec6x80,
                 .init_chipset   = init_chipset_aec62xx,
                 .init_hwif      = init_hwif_aec62xx,
-                .init_dma       = init_dma_aec62xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
@@ -370,13 +324,16 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
  *
  *      Called when the PCI registration layer (or the IDE initialization)
  *      finds a device matching our IDE device tables.
+ *
+ *      NOTE: since we're going to modify the 'name' field for AEC-6[26]80[R]
+ *      chips, pass a local copy of 'struct pci_device_id' down the call chain.
  */
  
 static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &aec62xx_chipsets[id->driver_data];
+        ide_pci_device_t d = aec62xx_chipsets[id->driver_data];
 
-        return d->init_setup(dev, d);
+        return d.init_setup(dev, &d);
 }
 
 static struct pci_device_id aec62xx_pci_tbl[] = {
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 27525ec2e19a..8a6b27b3bcc3 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/alim15x3.c             Version 0.21    2007/02/03
+ * linux/drivers/ide/pci/alim15x3.c             Version 0.25    Jun 9 2007
  *
  *  Copyright (C) 1998-2000 Michel Aubry, Maintainer
  *  Copyright (C) 1998-2000 Andrzej Krzysztofowicz, Maintainer
@@ -10,6 +10,7 @@
  *  Copyright (C) 2002 Alan Cox <alan@redhat.com>
  *  ALi (now ULi M5228) support by Clear Zhang <Clear.Zhang@ali.com.tw>
  *  Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>
+ *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  *
  *  (U)DMA capable version of ali 1533/1543(C), 1535(D)
  *
@@ -36,6 +37,7 @@
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
+#include <linux/dmi.h>
 
 #include <asm/io.h>
 
@@ -583,6 +585,35 @@ out:
         return 0;
 }
 
+/*
+ *      Cable special cases
+ */
+
+static struct dmi_system_id cable_dmi_table[] = {
+        {
+                .ident = "HP Pavilion N5430",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_BOARD_NAME, "OmniBook N32N-736"),
+                },
+        },
+        { }
+};
+
+static int ali_cable_override(struct pci_dev *pdev)
+{
+        /* Fujitsu P2000 */
+        if (pdev->subsystem_vendor == 0x10CF &&
+            pdev->subsystem_device == 0x10AF)
+                return 1;
+
+        /* Systems by DMI */
+        if (dmi_check_system(cable_dmi_table))
+                return 1;
+
+        return 0;
+}
+
 /**
  *      ata66_ali15x3   -       check for UDMA 66 support
  *      @hwif: IDE interface
@@ -594,37 +625,31 @@ out:
  *      FIXME: frobs bits that are not defined on newer ALi devicea
  */
 
-static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
+static u8 __devinit ata66_ali15x3(ide_hwif_t *hwif)
 {
         struct pci_dev *dev     = hwif->pci_dev;
-        unsigned int ata66      = 0;
-        u8 cable_80_pin[2]      = { 0, 0 };
-
         unsigned long flags;
-        u8 tmpbyte;
+        u8 cbl = ATA_CBL_PATA40, tmpbyte;
 
         local_irq_save(flags);
 
         if (m5229_revision >= 0xC2) {
                 /*
-                 * Ultra66 cable detection (from Host View)
-                 * m5229, 0x4a, bit0: primary, bit1: secondary 80 pin
-                 */
-                pci_read_config_byte(dev, 0x4a, &tmpbyte);
-                /*
-                 * 0x4a, bit0 is 0 => primary channel
-                 * has 80-pin (from host view)
-                 */
-                if (!(tmpbyte & 0x01)) cable_80_pin[0] = 1;
-                /*
-                 * 0x4a, bit1 is 0 => secondary channel
-                 * has 80-pin (from host view)
-                 */
-                if (!(tmpbyte & 0x02)) cable_80_pin[1] = 1;
-                /*
-                 * Allow ata66 if cable of current channel has 80 pins
+                 * m5229 80-pin cable detection (from Host View)
+                 *
+                 * 0x4a bit0 is 0 => primary channel has 80-pin
+                 * 0x4a bit1 is 0 => secondary channel has 80-pin
+                 *
+                 * Certain laptops use short but suitable cables
+                 * and don't implement the detect logic.
                  */
-                ata66 = (hwif->channel)?cable_80_pin[1]:cable_80_pin[0];
+                if (ali_cable_override(dev))
+                        cbl = ATA_CBL_PATA40_SHORT;
+                else {
+                        pci_read_config_byte(dev, 0x4a, &tmpbyte);
+                        if ((tmpbyte & (1 << hwif->channel)) == 0)
+                                cbl = ATA_CBL_PATA80;
+                }
         } else {
                 /*
                  * check m1533, 0x5e, bit 1~4 == 1001 => & 00011110 = 00010010
@@ -657,7 +682,7 @@ static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
 
         local_irq_restore(flags);
 
-        return(ata66);
+        return cbl;
 }
 
 /**
@@ -708,8 +733,9 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
                 hwif->dma_setup = &ali15x3_dma_setup;
                 if (!noautodma)
                         hwif->autodma = 1;
-                if (!(hwif->udma_four))
-                        hwif->udma_four = ata66_ali15x3(hwif);
+
+                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                        hwif->cbl = ata66_ali15x3(hwif);
         }
         hwif->drives[0].autodma = hwif->autodma;
         hwif->drives[1].autodma = hwif->autodma;
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index a2be65fcf89c..84ed30cdb324 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -1,10 +1,11 @@
 /*
- * Version 2.16
+ * Version 2.20
  *
  * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
  * IDE driver for Linux.
  *
  * Copyright (c) 2000-2002 Vojtech Pavlik
+ * Copyright (c) 2007 Bartlomiej Zolnierkiewicz
  *
  * Based on the work of:
  *      Andre Hedrick
@@ -37,11 +38,6 @@
 #define AMD_ADDRESS_SETUP       (0x0c + amd_config->base)
 #define AMD_UDMA_TIMING         (0x10 + amd_config->base)
 
-#define AMD_UDMA                0x07
-#define AMD_UDMA_33             0x01
-#define AMD_UDMA_66             0x02
-#define AMD_UDMA_100            0x03
-#define AMD_UDMA_133            0x04
 #define AMD_CHECK_SWDMA         0x08
 #define AMD_BAD_SWDMA           0x10
 #define AMD_BAD_FIFO            0x20
@@ -53,32 +49,33 @@
 
 static struct amd_ide_chip {
         unsigned short id;
-        unsigned long base;
-        unsigned char flags;
+        u8 base;
+        u8 udma_mask;
+        u8 flags;
 } amd_ide_chips[] = {
-        { PCI_DEVICE_ID_AMD_COBRA_7401,         0x40, AMD_UDMA_33 | AMD_BAD_SWDMA },
-        { PCI_DEVICE_ID_AMD_VIPER_7409,         0x40, AMD_UDMA_66 | AMD_CHECK_SWDMA },
-        { PCI_DEVICE_ID_AMD_VIPER_7411,         0x40, AMD_UDMA_100 | AMD_BAD_FIFO },
-        { PCI_DEVICE_ID_AMD_OPUS_7441,          0x40, AMD_UDMA_100 },
-        { PCI_DEVICE_ID_AMD_8111_IDE,           0x40, AMD_UDMA_133 | AMD_CHECK_SERENADE },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,      0x50, AMD_UDMA_100 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE,     0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,    0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,   0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,     0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,    0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,   0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,  0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE,        0x50, AMD_UDMA_133 },
-        { PCI_DEVICE_ID_AMD_CS5536_IDE,                 0x40, AMD_UDMA_100 },
+        { PCI_DEVICE_ID_AMD_COBRA_7401,          0x40, ATA_UDMA2, AMD_BAD_SWDMA },
+        { PCI_DEVICE_ID_AMD_VIPER_7409,          0x40, ATA_UDMA4, AMD_CHECK_SWDMA },
+        { PCI_DEVICE_ID_AMD_VIPER_7411,          0x40, ATA_UDMA5, AMD_BAD_FIFO },
+        { PCI_DEVICE_ID_AMD_OPUS_7441,           0x40, ATA_UDMA5, },
+        { PCI_DEVICE_ID_AMD_8111_IDE,            0x40, ATA_UDMA6, AMD_CHECK_SERENADE },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,       0x50, ATA_UDMA5, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE,      0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,     0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,    0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,      0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,     0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,    0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,   0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE, 0x50, ATA_UDMA6, },
+        { PCI_DEVICE_ID_AMD_CS5536_IDE,          0x40, ATA_UDMA5, },
         { 0 }
 };
 
@@ -87,7 +84,7 @@ static ide_pci_device_t *amd_chipset;
 static unsigned int amd_80w;
 static unsigned int amd_clock;
 
-static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" };
+static char *amd_dma[] = { "16", "25", "33", "44", "66", "100", "133" };
 static unsigned char amd_cyc2udma[] = { 6, 6, 5, 4, 0, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 7 };
 
 /*
@@ -128,7 +125,7 @@ static int amd74xx_get_info(char *buffer, char **addr, off_t offset, int count)
 
         pci_read_config_byte(dev, PCI_REVISION_ID, &t);
         amd_print("Revision:                           IDE %#x", t);
-        amd_print("Highest DMA rate:                   %s", amd_dma[amd_config->flags & AMD_UDMA]);
+        amd_print("Highest DMA rate:                   UDMA%s", amd_dma[fls(amd_config->udma_mask) - 1]);
 
         amd_print("BM-DMA base:                        %#lx", amd_base);
         amd_print("PCI clock:                          %d.%dMHz", amd_clock / 1000, amd_clock / 100 % 10);
@@ -221,12 +218,12 @@ static void amd_set_speed(struct pci_dev *dev, unsigned char dn, struct ide_timi
         pci_write_config_byte(dev, AMD_DRIVE_TIMING + (3 - dn),
                 ((FIT(timing->active, 1, 16) - 1) << 4) | (FIT(timing->recover, 1, 16) - 1));
 
-        switch (amd_config->flags & AMD_UDMA) {
-                case AMD_UDMA_33:  t = timing->udma ? (0xc0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
-                case AMD_UDMA_66:  t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 2, 10)]) : 0x03; break;
-                case AMD_UDMA_100: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 1, 10)]) : 0x03; break;
-                case AMD_UDMA_133: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 1, 15)]) : 0x03; break;
-                default: return;
+        switch (amd_config->udma_mask) {
+        case ATA_UDMA2: t = timing->udma ? (0xc0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
+        case ATA_UDMA4: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 2, 10)]) : 0x03; break;
+        case ATA_UDMA5: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 1, 10)]) : 0x03; break;
+        case ATA_UDMA6: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 1, 15)]) : 0x03; break;
+        default: return;
         }
 
         pci_write_config_byte(dev, AMD_UDMA_TIMING + (3 - dn), t);
@@ -248,7 +245,7 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed)
                 ide_config_drive_speed(drive, speed);
 
         T = 1000000000 / amd_clock;
-        UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2);
+        UT = (amd_config->udma_mask == ATA_UDMA2) ? T : (T / 2);
 
         ide_timing_compute(drive, speed, &t, T, UT);
 
@@ -277,29 +274,19 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed)
 static void amd74xx_tune_drive(ide_drive_t *drive, u8 pio)
 {
         if (pio == 255) {
-                amd_set_drive(drive, ide_find_best_mode(drive, XFER_PIO | XFER_EPIO));
+                amd_set_drive(drive, ide_find_best_pio_mode(drive));
                 return;
         }
 
         amd_set_drive(drive, XFER_PIO_0 + min_t(byte, pio, 5));
 }
 
-/*
- * amd74xx_dmaproc() is a callback from upper layers that can do
- * a lot, but we use it for DMA/PIO tuning only, delegating everything
- * else to the default ide_dmaproc().
- */
-
 static int amd74xx_ide_dma_check(ide_drive_t *drive)
 {
-        int w80 = HWIF(drive)->udma_four;
+        u8 speed = ide_max_dma_mode(drive);
 
-        u8 speed = ide_find_best_mode(drive,
-                XFER_PIO | XFER_EPIO | XFER_MWDMA | XFER_UDMA |
-                ((amd_config->flags & AMD_BAD_SWDMA) ? 0 : XFER_SWDMA) |
-                (w80 && (amd_config->flags & AMD_UDMA) >= AMD_UDMA_66 ? XFER_UDMA_66 : 0) |
-                (w80 && (amd_config->flags & AMD_UDMA) >= AMD_UDMA_100 ? XFER_UDMA_100 : 0) |
-                (w80 && (amd_config->flags & AMD_UDMA) >= AMD_UDMA_133 ? XFER_UDMA_133 : 0));
+        if (speed == 0)
+                speed = ide_find_best_pio_mode(drive);
 
         amd_set_drive(drive, speed);
 
@@ -334,10 +321,10 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
  * Check 80-wire cable presence.
  */
 
-        switch (amd_config->flags & AMD_UDMA) {
+        switch (amd_config->udma_mask) {
 
-                case AMD_UDMA_133:
-                case AMD_UDMA_100:
+                case ATA_UDMA6:
+                case ATA_UDMA5:
                         pci_read_config_byte(dev, AMD_CABLE_DETECT, &t);
                         pci_read_config_dword(dev, AMD_UDMA_TIMING, &u);
                         amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0);
@@ -349,7 +336,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
                                 }
                         break;
 
-                case AMD_UDMA_66:
+                case ATA_UDMA4:
                         /* no host side cable detection */
                         amd_80w = 0x03;
                         break;
@@ -370,7 +357,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
         if ((amd_config->flags & AMD_CHECK_SERENADE) &&
                 dev->subsystem_vendor == PCI_VENDOR_ID_AMD &&
                 dev->subsystem_device == PCI_DEVICE_ID_AMD_SERENADE)
-                        amd_config->flags = AMD_UDMA_100;
+                        amd_config->udma_mask = ATA_UDMA5;
 
 /*
  * Determine the system bus clock.
@@ -395,8 +382,9 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
  */
 
         pci_read_config_byte(dev, PCI_REVISION_ID, &t);
-        printk(KERN_INFO "%s: %s (rev %02x) %s controller\n",
-                amd_chipset->name, pci_name(dev), t, amd_dma[amd_config->flags & AMD_UDMA]);
+        printk(KERN_INFO "%s: %s (rev %02x) UDMA%s controller\n",
+                amd_chipset->name, pci_name(dev), t,
+                amd_dma[fls(amd_config->udma_mask) - 1]);
 
 /*
  * Register /proc/ide/amd74xx entry
@@ -437,12 +425,19 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 return;
 
         hwif->atapi_dma = 1;
-        hwif->ultra_mask = 0x7f;
-        hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
 
-        if (!hwif->udma_four)
-                hwif->udma_four = (amd_80w >> hwif->channel) & 1;
+        hwif->ultra_mask = amd_config->udma_mask;
+        hwif->mwdma_mask = 0x07;
+        if ((amd_config->flags & AMD_BAD_SWDMA) == 0)
+                hwif->swdma_mask = 0x07;
+
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
+                if ((amd_80w >> hwif->channel) & 1)
+                        hwif->cbl = ATA_CBL_PATA80;
+                else
+                        hwif->cbl = ATA_CBL_PATA40;
+        }
+
         hwif->ide_dma_check = &amd74xx_ide_dma_check;
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 8ab33faf6f76..2761510309b3 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -264,10 +264,11 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
         hwif->swdma_mask = 0x04;
 
         pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
+
         if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
-                hwif->udma_four = 1;
+                hwif->cbl = ATA_CBL_PATA80;
         else
-                hwif->udma_four = 0;
+                hwif->cbl = ATA_CBL_PATA40;
 
         hwif->dma_host_on = &atiixp_dma_host_on;
         hwif->dma_host_off = &atiixp_dma_host_off;
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 7c57dc696f52..8631b6c8aa15 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cmd64x.c               Version 1.47    Mar 19, 2007
+ * linux/drivers/ide/pci/cmd64x.c               Version 1.50    May 10, 2007
  *
  * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.
  *           Due to massive hardware bugs, UltraDMA is only supported
@@ -52,9 +52,6 @@
 #define   ARTTIM23_DIS_RA2      0x04
 #define   ARTTIM23_DIS_RA3      0x08
 #define   ARTTIM23_INTR_CH1     0x10
-#define ARTTIM2         0x57
-#define ARTTIM3         0x57
-#define DRWTIM23        0x58
 #define DRWTIM2         0x58
 #define BRST            0x59
 #define DRWTIM3         0x5b
@@ -469,71 +466,43 @@ static int cmd646_1_ide_dma_end (ide_drive_t *drive)
 
 static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const char *name)
 {
-        u32 class_rev = 0;
         u8 mrdmode = 0;
 
-        pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
-        class_rev &= 0xff;
+        if (dev->device == PCI_DEVICE_ID_CMD_646) {
+                u8 rev = 0;
 
-        switch(dev->device) {
-                case PCI_DEVICE_ID_CMD_643:
-                        break;
-                case PCI_DEVICE_ID_CMD_646:
-                        printk(KERN_INFO "%s: chipset revision 0x%02X, ", name, class_rev);
-                        switch(class_rev) {
-                                case 0x07:
-                                case 0x05:
-                                        printk("UltraDMA Capable");
-                                        break;
-                                case 0x03:
-                                        printk("MultiWord DMA Force Limited");
-                                        break;
-                                case 0x01:
-                                default:
-                                        printk("MultiWord DMA Limited, IRQ workaround enabled");
-                                        break;
-                                }
-                        printk("\n");
-                        break;
-                case PCI_DEVICE_ID_CMD_648:
-                case PCI_DEVICE_ID_CMD_649:
+                pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
+
+                switch (rev) {
+                case 0x07:
+                case 0x05:
+                        printk("%s: UltraDMA capable", name);
                         break;
+                case 0x03:
                 default:
+                        printk("%s: MultiWord DMA force limited", name);
+                        break;
+                case 0x01:
+                        printk("%s: MultiWord DMA limited, "
+                               "IRQ workaround enabled\n", name);
                         break;
+                }
         }
 
         /* Set a good latency timer and cache line size value. */
         (void) pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);
         /* FIXME: pci_set_master() to ensure a good latency timer value */
 
-        /* Setup interrupts. */
-        (void) pci_read_config_byte(dev, MRDMODE, &mrdmode);
-        mrdmode &= ~(0x30);
-        (void) pci_write_config_byte(dev, MRDMODE, mrdmode);
-
-        /* Use MEMORY READ LINE for reads.
-         * NOTE: Although not mentioned in the PCI0646U specs,
-         *       these bits are write only and won't be read
-         *       back as set or not.  The PCI0646U2 specs clarify
-         *       this point.
+        /*
+         * Enable interrupts, select MEMORY READ LINE for reads.
+         *
+         * NOTE: although not mentioned in the PCI0646U specs,
+         * bits 0-1 are write only and won't be read back as
+         * set or not -- PCI0646U2 specs clarify this point.
          */
-        (void) pci_write_config_byte(dev, MRDMODE, mrdmode | 0x02);
-
-        /* Set reasonable active/recovery/address-setup values. */
-        (void) pci_write_config_byte(dev, ARTTIM0,  0x40);
-        (void) pci_write_config_byte(dev, DRWTIM0,  0x3f);
-        (void) pci_write_config_byte(dev, ARTTIM1,  0x40);
-        (void) pci_write_config_byte(dev, DRWTIM1,  0x3f);
-#ifdef __i386__
-        (void) pci_write_config_byte(dev, ARTTIM23, 0x1c);
-#else
-        (void) pci_write_config_byte(dev, ARTTIM23, 0x5c);
-#endif
-        (void) pci_write_config_byte(dev, DRWTIM23, 0x3f);
-        (void) pci_write_config_byte(dev, DRWTIM3,  0x3f);
-#ifdef CONFIG_PPC
-        (void) pci_write_config_byte(dev, UDIDETCR0, 0xf0);
-#endif /* CONFIG_PPC */
+        (void) pci_read_config_byte (dev, MRDMODE, &mrdmode);
+        mrdmode &= ~0x30;
+        (void) pci_write_config_byte(dev, MRDMODE, (mrdmode | 0x02));
 
 #if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
 
@@ -548,29 +517,27 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha
         return 0;
 }
 
-static unsigned int __devinit ata66_cmd64x(ide_hwif_t *hwif)
+static u8 __devinit ata66_cmd64x(ide_hwif_t *hwif)
 {
-        u8 ata66 = 0, mask = (hwif->channel) ? 0x02 : 0x01;
+        struct pci_dev  *dev    = hwif->pci_dev;
+        u8 bmidecsr = 0, mask   = hwif->channel ? 0x02 : 0x01;
 
-        switch(hwif->pci_dev->device) {
-                case PCI_DEVICE_ID_CMD_643:
-                case PCI_DEVICE_ID_CMD_646:
-                        return ata66;
-                default:
-                        break;
+        switch (dev->device) {
+        case PCI_DEVICE_ID_CMD_648:
+        case PCI_DEVICE_ID_CMD_649:
+                pci_read_config_byte(dev, BMIDECSR, &bmidecsr);
+                return (bmidecsr & mask) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
+        default:
+                return ATA_CBL_PATA40;
         }
-        pci_read_config_byte(hwif->pci_dev, BMIDECSR, &ata66);
-        return (ata66 & mask) ? 1 : 0;
 }
 
 static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
 {
         struct pci_dev *dev     = hwif->pci_dev;
-        unsigned int class_rev;
+        u8 rev                  = 0;
 
-        hwif->autodma = 0;
-        pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
-        class_rev &= 0xff;
+        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
 
         hwif->tuneproc  = &cmd64x_tune_drive;
         hwif->speedproc = &cmd64x_tune_chipset;
@@ -580,8 +547,8 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma = 1;
-
+        hwif->atapi_dma  = 1;
+        hwif->mwdma_mask = 0x07;
         hwif->ultra_mask = hwif->cds->udma_mask;
 
         /*
@@ -596,16 +563,15 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
          *
          * So we only do UltraDMA on revision 0x05 and 0x07 chipsets.
          */
-        if (dev->device == PCI_DEVICE_ID_CMD_646 && class_rev < 5)
+        if (dev->device == PCI_DEVICE_ID_CMD_646 && rev < 5)
                 hwif->ultra_mask = 0x00;
 
-        hwif->mwdma_mask = 0x07;
-
         hwif->ide_dma_check = &cmd64x_config_drive_for_dma;
-        if (!(hwif->udma_four))
-                hwif->udma_four = ata66_cmd64x(hwif);
 
-        switch(dev->device) {
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = ata66_cmd64x(hwif);
+
+        switch (dev->device) {
         case PCI_DEVICE_ID_CMD_648:
         case PCI_DEVICE_ID_CMD_649:
         alt_irq_bits:
@@ -614,10 +580,10 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
                 break;
         case PCI_DEVICE_ID_CMD_646:
                 hwif->chipset = ide_cmd646;
-                if (class_rev == 0x01) {
+                if (rev == 0x01) {
                         hwif->ide_dma_end = &cmd646_1_ide_dma_end;
                         break;
-                } else if (class_rev >= 0x03)
+                } else if (rev >= 0x03)
                         goto alt_irq_bits;
                 /* fall thru */
         default:
@@ -626,11 +592,9 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
                 break;
         }
 
-
         if (!noautodma)
                 hwif->autodma = 1;
-        hwif->drives[0].autodma = hwif->autodma;
-        hwif->drives[1].autodma = hwif->autodma;
+        hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
 }
 
 static int __devinit init_setup_cmd64x(struct pci_dev *dev, ide_pci_device_t *d)
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 41925c47ef05..10f61f38243c 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -187,7 +187,8 @@ static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
 
         /* if a 80 wire cable was detected */
         pci_read_config_byte(dev, CS5535_CABLE_DETECT, &bit);
-        return (bit & 1);
+
+        return (bit & 1) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
 }
 
 /****
@@ -212,8 +213,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
         hwif->ultra_mask = 0x1F;
         hwif->mwdma_mask = 0x07;
 
-
-        hwif->udma_four = cs5535_cable_detect(hwif->pci_dev);
+        hwif->cbl = cs5535_cable_detect(hwif->pci_dev);
 
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index c33d0b0f11c9..4b6bae8eee82 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/hpt366.c               Version 1.06    Jun 27, 2007
+ * linux/drivers/ide/pci/hpt366.c               Version 1.10    Jun 29, 2007
  *
  * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
  * Portions Copyright (C) 2001          Sun Microsystems, Inc.
@@ -77,7 +77,7 @@
  *   since they may tamper with its fields
  * - prefix the driver startup messages with the real chip name
  * - claim the extra 240 bytes of I/O space for all chips
- * - optimize the rate masking/filtering and the drive list lookup code
+ * - optimize the UltraDMA filtering and the drive list lookup code
  * - use pci_get_slot() to get to the function 1 of HPT36x/374
  * - cache offset of the channel's misc. control registers (MCRs) being used
  *   throughout the driver
@@ -99,9 +99,9 @@
  *   stop duplicating it for each channel by storing the pointer in the pci_dev
  *   structure: first, at the init_setup stage, point it to a static "template"
  *   with only the chip type and its specific base DPLL frequency, the highest
- *   supported DMA mode, and the chip settings table pointer filled, then, at
- *   the init_chipset stage, allocate per-chip instance  and fill it with the
- *   rest of the necessary information
+ *   UltraDMA mode, and the chip settings table pointer filled,  then, at the
+ *   init_chipset stage, allocate per-chip instance  and fill it with the rest
+ *   of the necessary information
  * - get rid of the constant thresholds in the HPT37x PCI clock detection code,
  *   switch  to calculating  PCI clock frequency based on the chip's base DPLL
  *   frequency
@@ -112,6 +112,7 @@
  *   also fixing the interchanged 25/40 MHz PCI clock cases for HPT36x chips;
  *   unify HPT36x/37x timing setup code and the speedproc handlers by joining
  *   the register setting lists into the table indexed by the clock selected
+ * - set the correct hwif->ultra_mask for each individual chip
  *      Sergei Shtylyov, <sshtylyov@ru.mvista.com> or <source@mvista.com>
  */
 
@@ -391,7 +392,7 @@ enum ata_clock {
 
 struct hpt_info {
         u8 chip_type;           /* Chip type */
-        u8 max_mode;            /* Speeds allowed */
+        u8 max_ultra;           /* Max. UltraDMA mode allowed */
         u8 dpll_clk;            /* DPLL clock in MHz */
         u8 pci_clk;             /* PCI  clock in MHz */
         u32 **settings;         /* Chipset settings table */
@@ -430,77 +431,77 @@ static u32 *hpt37x_settings[NUM_ATA_CLOCKS] = {
 
 static struct hpt_info hpt36x __devinitdata = {
         .chip_type      = HPT36x,
-        .max_mode       = (HPT366_ALLOW_ATA66_4 || HPT366_ALLOW_ATA66_3) ? 2 : 1,
+        .max_ultra      = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? 4 : 3) : 2,
         .dpll_clk       = 0,    /* no DPLL */
         .settings       = hpt36x_settings
 };
 
 static struct hpt_info hpt370 __devinitdata = {
         .chip_type      = HPT370,
-        .max_mode       = HPT370_ALLOW_ATA100_5 ? 3 : 2,
+        .max_ultra      = HPT370_ALLOW_ATA100_5 ? 5 : 4,
         .dpll_clk       = 48,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt370a __devinitdata = {
         .chip_type      = HPT370A,
-        .max_mode       = HPT370_ALLOW_ATA100_5 ? 3 : 2,
+        .max_ultra      = HPT370_ALLOW_ATA100_5 ? 5 : 4,
         .dpll_clk       = 48,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt374 __devinitdata = {
         .chip_type      = HPT374,
-        .max_mode       = 3,
+        .max_ultra      = 5,
         .dpll_clk       = 48,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt372 __devinitdata = {
         .chip_type      = HPT372,
-        .max_mode       = HPT372_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT372_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 55,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt372a __devinitdata = {
         .chip_type      = HPT372A,
-        .max_mode       = HPT372_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT372_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 66,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt302 __devinitdata = {
         .chip_type      = HPT302,
-        .max_mode       = HPT302_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT372_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 66,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt371 __devinitdata = {
         .chip_type      = HPT371,
-        .max_mode       = HPT371_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT371_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 66,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt372n __devinitdata = {
         .chip_type      = HPT372N,
-        .max_mode       = HPT372_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT372_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 77,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt302n __devinitdata = {
         .chip_type      = HPT302N,
-        .max_mode       = HPT302_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT302_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 77,
         .settings       = hpt37x_settings
 };
 
 static struct hpt_info hpt371n __devinitdata = {
         .chip_type      = HPT371N,
-        .max_mode       = HPT371_ALLOW_ATA133_6 ? 4 : 3,
+        .max_ultra      = HPT371_ALLOW_ATA133_6 ? 6 : 5,
         .dpll_clk       = 77,
         .settings       = hpt37x_settings
 };
@@ -523,53 +524,38 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
 static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 {
         struct hpt_info *info   = pci_get_drvdata(HWIF(drive)->pci_dev);
-        u8 chip_type            = info->chip_type;
-        u8 mode                 = info->max_mode;
         u8 mask;
 
-        switch (mode) {
-                case 0x04:
-                        mask = 0x7f;
-                        break;
-                case 0x03:
+        switch (info->chip_type) {
+        case HPT370A:
+                if (!HPT370_ALLOW_ATA100_5 ||
+                    check_in_drive_list(drive, bad_ata100_5))
+                        return 0x1f;
+                else
+                        return 0x3f;
+        case HPT370:
+                if (!HPT370_ALLOW_ATA100_5 ||
+                    check_in_drive_list(drive, bad_ata100_5))
+                        mask = 0x1f;
+                else
                         mask = 0x3f;
-                        if (chip_type >= HPT374)
-                                break;
-                        if (!check_in_drive_list(drive, bad_ata100_5))
-                                goto check_bad_ata33;
-                        /* fall thru */
-                case 0x02:
+                break;
+        case HPT36x:
+                if (!HPT366_ALLOW_ATA66_4 ||
+                    check_in_drive_list(drive, bad_ata66_4))
+                        mask = 0x0f;
+                else
                         mask = 0x1f;
 
-                        /*
-                         * CHECK ME, Does this need to be changed to HPT374 ??
-                         */
-                        if (chip_type >= HPT370)
-                                goto check_bad_ata33;
-                        if (HPT366_ALLOW_ATA66_4 &&
-                            !check_in_drive_list(drive, bad_ata66_4))
-                                goto check_bad_ata33;
-
-                        mask = 0x0f;
-                        if (HPT366_ALLOW_ATA66_3 &&
-                            !check_in_drive_list(drive, bad_ata66_3))
-                                goto check_bad_ata33;
-                        /* fall thru */
-                case 0x01:
+                if (!HPT366_ALLOW_ATA66_3 ||
+                    check_in_drive_list(drive, bad_ata66_3))
                         mask = 0x07;
-
-                check_bad_ata33:
-                        if (chip_type >= HPT370A)
-                                break;
-                        if (!check_in_drive_list(drive, bad_ata33))
-                                break;
-                        /* fall thru */
-                case 0x00:
-                default:
-                        mask = 0x00;
-                        break;
+                break;
+        default:
+                return 0x7f;
         }
-        return mask;
+
+        return check_in_drive_list(drive, bad_ata33) ? 0x00 : mask;
 }
 
 static u32 get_speed_setting(u8 speed, struct hpt_info *info)
@@ -737,7 +723,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
  * This is specific to the HPT366 UDMA chipset
  * by HighPoint|Triones Technologies, Inc.
  */
-static int hpt366_ide_dma_lostirq(ide_drive_t *drive)
+static void hpt366_dma_lost_irq(ide_drive_t *drive)
 {
         struct pci_dev *dev = HWIF(drive)->pci_dev;
         u8 mcr1 = 0, mcr3 = 0, scr1 = 0;
@@ -749,7 +735,7 @@ static int hpt366_ide_dma_lostirq(ide_drive_t *drive)
                 drive->name, __FUNCTION__, mcr1, mcr3, scr1);
         if (scr1 & 0x10)
                 pci_write_config_byte(dev, 0x5a, scr1 & ~0x10);
-        return __ide_dma_lostirq(drive);
+        ide_dma_lost_irq(drive);
 }
 
 static void hpt370_clear_engine(ide_drive_t *drive)
@@ -799,10 +785,10 @@ static int hpt370_ide_dma_end(ide_drive_t *drive)
         return __ide_dma_end(drive);
 }
 
-static int hpt370_ide_dma_timeout(ide_drive_t *drive)
+static void hpt370_dma_timeout(ide_drive_t *drive)
 {
         hpt370_irq_timeout(drive);
-        return __ide_dma_timeout(drive);
+        ide_dma_timeout(drive);
 }
 
 /* returns 1 if DMA IRQ issued, 0 otherwise */
@@ -1150,7 +1136,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
                   * Select 66 MHz DPLL clock only if UltraATA/133 mode is
                   * supported/enabled, use 50 MHz DPLL clock otherwise...
                   */
-                if (info->max_mode == 0x04) {
+                if (info->max_ultra == 6) {
                         dpll_clk = 66;
                         clock = ATA_CLOCK_66MHZ;
                 } else if (dpll_clk) {  /* HPT36x chips don't have DPLL */
@@ -1243,7 +1229,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         struct pci_dev  *dev            = hwif->pci_dev;
         struct hpt_info *info           = pci_get_drvdata(dev);
         int serialize                   = HPT_SERIALIZE_IO;
-        u8  scr1 = 0, ata66             = (hwif->channel) ? 0x01 : 0x02;
+        u8  scr1 = 0, ata66             = hwif->channel ? 0x01 : 0x02;
         u8  chip_type                   = info->chip_type;
         u8  new_mcr, old_mcr            = 0;
 
@@ -1256,7 +1242,9 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         hwif->intrproc                  = &hpt3xx_intrproc;
         hwif->maskproc                  = &hpt3xx_maskproc;
         hwif->busproc                   = &hpt3xx_busproc;
-        hwif->udma_filter               = &hpt3xx_udma_filter;
+
+        if (chip_type <= HPT370A)
+                hwif->udma_filter       = &hpt3xx_udma_filter;
 
         /*
          * HPT3xxN chips have some complications:
@@ -1305,7 +1293,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
                 return;
         }
 
-        hwif->ultra_mask = 0x7f;
+        hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
 
         /*
@@ -1342,8 +1330,8 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         } else
                 pci_read_config_byte (dev, 0x5a, &scr1);
 
-        if (!hwif->udma_four)
-                hwif->udma_four = (scr1 & ata66) ? 0 : 1;
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 
         hwif->ide_dma_check             = &hpt366_config_drive_xfer_rate;
 
@@ -1353,9 +1341,9 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         } else if (chip_type >= HPT370) {
                 hwif->dma_start         = &hpt370_ide_dma_start;
                 hwif->ide_dma_end       = &hpt370_ide_dma_end;
-                hwif->ide_dma_timeout   = &hpt370_ide_dma_timeout;
+                hwif->dma_timeout       = &hpt370_dma_timeout;
         } else
-                hwif->ide_dma_lostirq   = &hpt366_ide_dma_lostirq;
+                hwif->dma_lost_irq      = &hpt366_dma_lost_irq;
 
         if (!noautodma)
                 hwif->autodma = 1;
@@ -1503,9 +1491,35 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
 
         pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
 
-        if (rev > 6)
+        switch (rev) {
+        case 0:
+        case 1:
+        case 2:
+                /*
+                 * HPT36x chips have one channel per function and have
+                 * both channel enable bits located differently and visible
+                 * to both functions -- really stupid design decision... :-(
+                 * Bit 4 is for the primary channel, bit 5 for the secondary.
+                 */
+                d->channels = 1;
+                d->enablebits[0].mask = d->enablebits[0].val = 0x10;
+
+                d->udma_mask = HPT366_ALLOW_ATA66_3 ?
+                              (HPT366_ALLOW_ATA66_4 ? 0x1f : 0x0f) : 0x07;
+                break;
+        case 3:
+        case 4:
+                d->udma_mask = HPT370_ALLOW_ATA100_5 ? 0x3f : 0x1f;
+                break;
+        default:
                 rev = 6;
-                
+                /* fall thru */
+        case 5:
+        case 6:
+                d->udma_mask = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f;
+                break;
+        }
+
         d->name = chipset_names[rev];
 
         pci_set_drvdata(dev, info[rev]);
@@ -1513,15 +1527,6 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
         if (rev > 2)
                 goto init_single;
 
-        /*
-         * HPT36x chips have one channel per function and have
-         * both channel enable bits located differently and visible
-         * to both functions -- really stupid design decision... :-(
-         * Bit 4 is for the primary channel, bit 5 for the secondary.
-         */
-        d->channels = 1;
-        d->enablebits[0].mask = d->enablebits[0].val = 0x10;
-
         if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) {
                 u8  mcr1 = 0, pin1 = 0, pin2 = 0;
                 int ret;
@@ -1573,6 +1578,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
+                .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
                 .extra          = 240
         },{     /* 2 */
@@ -1584,6 +1590,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
+                .udma_mask      = HPT302_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
                 .extra          = 240
         },{     /* 3 */
@@ -1595,6 +1602,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
+                .udma_mask      = HPT371_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
                 .extra          = 240
         },{     /* 4 */
@@ -1606,6 +1614,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .channels       = 2,    /* 4 */
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
+                .udma_mask      = 0x3f,
                 .bootable       = OFF_BOARD,
                 .extra          = 240
         },{     /* 5 */
@@ -1617,6 +1626,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .channels       = 2,    /* 4 */
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
+                .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
                 .extra          = 240
         }
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index c04a02687b95..ff48c23e571e 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -231,7 +231,7 @@ static int it8213_config_drive_for_dma (ide_drive_t *drive)
 
 static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
 {
-        u8 reg42h = 0, ata66 = 0;
+        u8 reg42h = 0;
 
         hwif->speedproc = &it8213_tune_chipset;
         hwif->tuneproc  = &it8213_tuneproc;
@@ -250,11 +250,11 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
         hwif->swdma_mask = 0x04;
 
         pci_read_config_byte(hwif->pci_dev, 0x42, &reg42h);
-        ata66 = (reg42h & 0x02) ? 0 : 1;
 
         hwif->ide_dma_check = &it8213_config_drive_for_dma;
-        if (!(hwif->udma_four))
-                hwif->udma_four = ata66;
+
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = (reg42h & 0x02) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 
         /*
          *      The BIOS often doesn't set up DMA on this controller
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 3aeb7f1b7916..8197b653ba1e 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -491,10 +491,10 @@ static int it821x_config_drive_for_dma (ide_drive_t *drive)
  *      the needed logic onboard.
  */
 
-static unsigned int __devinit ata66_it821x(ide_hwif_t *hwif)
+static u8 __devinit ata66_it821x(ide_hwif_t *hwif)
 {
         /* The reference driver also only does disk side */
-        return 1;
+        return ATA_CBL_PATA80;
 }
 
 /**
@@ -662,8 +662,9 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
         hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check = &it821x_config_drive_for_dma;
-        if (!(hwif->udma_four))
-                hwif->udma_four = ata66_it821x(hwif);
+
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = ata66_it821x(hwif);
 
         /*
          *      The BIOS often doesn't set up DMA on this controller
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 76ed25147229..a6008f63e71e 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -25,10 +25,10 @@ typedef enum {
  *      ata66_jmicron           -       Cable check
  *      @hwif: IDE port
  *
- *      Return 1 if the cable is 80pin
+ *      Returns the cable type.
  */
 
-static int __devinit ata66_jmicron(ide_hwif_t *hwif)
+static u8 __devinit ata66_jmicron(ide_hwif_t *hwif)
 {
         struct pci_dev *pdev = hwif->pci_dev;
 
@@ -70,16 +70,17 @@ static int __devinit ata66_jmicron(ide_hwif_t *hwif)
         {
         case PORT_PATA0:
                 if (control & (1 << 3)) /* 40/80 pin primary */
-                        return 0;
-                return 1;
+                        return ATA_CBL_PATA40;
+                return ATA_CBL_PATA80;
         case PORT_PATA1:
                 if (control5 & (1 << 19))       /* 40/80 pin secondary */
-                        return 0;
-                return 1;
+                        return ATA_CBL_PATA40;
+                return ATA_CBL_PATA80;
         case PORT_SATA:
                 break;
         }
-        return 1; /* Avoid bogus "control reaches end of non-void function" */
+        /* Avoid bogus "control reaches end of non-void function" */
+        return ATA_CBL_PATA80;
 }
 
 static void jmicron_tuneproc (ide_drive_t *drive, byte mode_wanted)
@@ -159,8 +160,9 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
         hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check = &jmicron_config_drive_for_dma;
-        if (!(hwif->udma_four))
-                hwif->udma_four = ata66_jmicron(hwif);
+
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = ata66_jmicron(hwif);
 
         hwif->autodma = 1;
         hwif->drives[0].autodma = hwif->autodma;
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 0765dce6948e..ee5020df005d 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -225,7 +225,10 @@ static void pdcnew_tune_drive(ide_drive_t *drive, u8 pio)
 
 static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
 {
-        return get_indexed_reg(hwif, 0x0b) & 0x04;
+        if (get_indexed_reg(hwif, 0x0b) & 0x04)
+                return ATA_CBL_PATA40;
+        else
+                return ATA_CBL_PATA80;
 }
 
 static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
@@ -509,8 +512,8 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
 
         hwif->ide_dma_check = &pdcnew_config_drive_xfer_rate;
 
-        if (!hwif->udma_four)
-                hwif->udma_four = pdcnew_cable_detect(hwif) ? 0 : 1;
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = pdcnew_cable_detect(hwif);
 
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 23844687deea..41ac4a94959f 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -152,8 +152,10 @@ static void pdc202xx_tune_drive(ide_drive_t *drive, u8 pio)
 static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif)
 {
         u16 CIS = 0, mask = (hwif->channel) ? (1<<11) : (1<<10);
+
         pci_read_config_word(hwif->pci_dev, 0x50, &CIS);
-        return (CIS & mask) ? 1 : 0;
+
+        return (CIS & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 }
 
 /*
@@ -267,18 +269,24 @@ somebody_else:
         return (dma_stat & 4) == 4;     /* return 1 if INTR asserted */
 }
 
-static int pdc202xx_ide_dma_lostirq(ide_drive_t *drive)
+static void pdc202xx_dma_lost_irq(ide_drive_t *drive)
 {
-        if (HWIF(drive)->resetproc != NULL)
-                HWIF(drive)->resetproc(drive);
-        return __ide_dma_lostirq(drive);
+        ide_hwif_t *hwif = HWIF(drive);
+
+        if (hwif->resetproc != NULL)
+                hwif->resetproc(drive);
+
+        ide_dma_lost_irq(drive);
 }
 
-static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
+static void pdc202xx_dma_timeout(ide_drive_t *drive)
 {
-        if (HWIF(drive)->resetproc != NULL)
-                HWIF(drive)->resetproc(drive);
-        return __ide_dma_timeout(drive);
+        ide_hwif_t *hwif = HWIF(drive);
+
+        if (hwif->resetproc != NULL)
+                hwif->resetproc(drive);
+
+        ide_dma_timeout(drive);
 }
 
 static void pdc202xx_reset_host (ide_hwif_t *hwif)
@@ -347,12 +355,13 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         hwif->err_stops_fifo = 1;
 
         hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
-        hwif->ide_dma_lostirq = &pdc202xx_ide_dma_lostirq;
-        hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout;
+        hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
+        hwif->dma_timeout = &pdc202xx_dma_timeout;
 
         if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
-                if (!(hwif->udma_four))
-                        hwif->udma_four = (pdc202xx_old_cable_detect(hwif)) ? 0 : 1;
+                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                        hwif->cbl = pdc202xx_old_cable_detect(hwif);
+
                 hwif->dma_start = &pdc202xx_old_ide_dma_start;
                 hwif->ide_dma_end = &pdc202xx_old_ide_dma_end;
         } 
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 8b219dd63024..2e0b29ef596a 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/piix.c        Version 0.47    February 8, 2007
+ *  linux/drivers/ide/pci/piix.c        Version 0.50    Jun 10, 2007
  *
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
@@ -394,14 +394,45 @@ static void piix_dma_clear_irq(ide_drive_t *drive)
         hwif->OUTB(dma_stat, hwif->dma_status);
 }
 
-static int __devinit piix_cable_detect(ide_hwif_t *hwif)
+struct ich_laptop {
+        u16 device;
+        u16 subvendor;
+        u16 subdevice;
+};
+
+/*
+ *      List of laptops that use short cables rather than 80 wire
+ */
+
+static const struct ich_laptop ich_laptop[] = {
+        /* devid, subvendor, subdev */
+        { 0x27DF, 0x0005, 0x0280 },     /* ICH7 on Acer 5602WLMi */
+        { 0x27DF, 0x1025, 0x0110 },     /* ICH7 on Acer 3682WLMi */
+        { 0x27DF, 0x1043, 0x1267 },     /* ICH7 on Asus W5F */
+        { 0x24CA, 0x1025, 0x0061 },     /* ICH4 on Acer Aspire 2023WLMi */
+        /* end marker */
+        { 0, }
+};
+
+static u8 __devinit piix_cable_detect(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *pdev = hwif->pci_dev;
+        const struct ich_laptop *lap = &ich_laptop[0];
         u8 reg54h = 0, mask = hwif->channel ? 0xc0 : 0x30;
 
-        pci_read_config_byte(dev, 0x54, &reg54h);
+        /* check for specials */
+        while (lap->device) {
+                if (lap->device == pdev->device &&
+                    lap->subvendor == pdev->subsystem_vendor &&
+                    lap->subdevice == pdev->subsystem_device) {
+                        return ATA_CBL_PATA40_SHORT;
+                }
+                lap++;
+        }
+
+        pci_read_config_byte(pdev, 0x54, &reg54h);
 
-        return (reg54h & mask) ? 1 : 0;
+        return (reg54h & mask) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
 }
 
 /**
@@ -444,8 +475,8 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
         hwif->swdma_mask = 0x04;
 
         if (hwif->ultra_mask & 0x78) {
-                if (!hwif->udma_four)
-                        hwif->udma_four = piix_cable_detect(hwif);
+                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                        hwif->cbl = piix_cable_detect(hwif);
         }
 
         if (no_piix_dma)
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 55bc0a32e34f..7b87488e3daa 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -716,7 +716,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
         hwif->atapi_dma = 1;
 
         /* we support 80c cable only. */
-        hwif->udma_four = 1;
+        hwif->cbl = ATA_CBL_PATA80;
 
         hwif->autodma = 0;
         if (!noautodma)
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index d9c4fd1ae996..1371b5bf6bf0 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/serverworks.c          Version 0.11    Jun 2 2007
+ * linux/drivers/ide/pci/serverworks.c          Version 0.20    Jun 3 2007
  *
  * Copyright (C) 1998-2000 Michel Aubry
  * Copyright (C) 1998-2000 Andrzej Krzysztofowicz
@@ -151,84 +151,11 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         if(dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4 &&
                 drive->media == ide_disk && speed >= XFER_UDMA_0)
                         BUG();
-                        
-        pci_read_config_byte(dev, drive_pci[drive->dn], &pio_timing);
-        pci_read_config_byte(dev, drive_pci2[drive->dn], &dma_timing);
+
         pci_read_config_byte(dev, (0x56|hwif->channel), &ultra_timing);
         pci_read_config_word(dev, 0x4A, &csb5_pio);
         pci_read_config_byte(dev, 0x54, &ultra_enable);
 
-        /* If we are in RAID mode (eg AMI MegaIDE) then we can't it
-           turns out trust the firmware configuration */
-
-        if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
-                goto oem_setup_failed;
-
-        /* Per Specified Design by OEM, and ASIC Architect */
-        if ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||
-            (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2)) {
-                if (!drive->init_speed) {
-                        u8 dma_stat = inb(hwif->dma_status);
-
-                        if (((ultra_enable << (7-drive->dn) & 0x80) == 0x80) &&
-                            ((dma_stat & (1<<(5+unit))) == (1<<(5+unit)))) {
-                                drive->current_speed = drive->init_speed = XFER_UDMA_0 + udma_modes[(ultra_timing >> (4*unit)) & ~(0xF0)];
-                                return 0;
-                        } else if ((dma_timing) &&
-                                   ((dma_stat&(1<<(5+unit)))==(1<<(5+unit)))) {
-                                u8 dmaspeed;
-
-                                switch (dma_timing & 0x77) {
-                                case 0x20:
-                                        dmaspeed = XFER_MW_DMA_2;
-                                        break;
-                                case 0x21:
-                                        dmaspeed = XFER_MW_DMA_1;
-                                        break;
-                                case 0x77:
-                                        dmaspeed = XFER_MW_DMA_0;
-                                        break;
-                                default:
-                                        goto dma_pio;
-                                }
-
-                                drive->current_speed = drive->init_speed = dmaspeed;
-                                return 0;
-                        }
-dma_pio:
-                        if (pio_timing) {
-                                u8 piospeed;
-
-                                switch (pio_timing & 0x7f) {
-                                case 0x20:
-                                        piospeed = XFER_PIO_4;
-                                        break;
-                                case 0x22:
-                                        piospeed = XFER_PIO_3;
-                                        break;
-                                case 0x34:
-                                        piospeed = XFER_PIO_2;
-                                        break;
-                                case 0x47:
-                                        piospeed = XFER_PIO_1;
-                                        break;
-                                case 0x5d:
-                                        piospeed = XFER_PIO_0;
-                                        break;
-                                default:
-                                        goto oem_setup_failed;
-                                }
-
-                                drive->current_speed = drive->init_speed = piospeed;
-                                return 0;
-                        }
-                }
-        }
-
-oem_setup_failed:
-
-        pio_timing      = 0;
-        dma_timing      = 0;
         ultra_timing    &= ~(0x0F << (4*unit));
         ultra_enable    &= ~(0x01 << drive->dn);
         csb5_pio        &= ~(0x0F << (4*drive->dn));
@@ -402,9 +329,9 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha
         return dev->irq;
 }
 
-static unsigned int __devinit ata66_svwks_svwks (ide_hwif_t *hwif)
+static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif)
 {
-        return 1;
+        return ATA_CBL_PATA80;
 }
 
 /* On Dell PowerEdge servers with a CSB5/CSB6, the top two bits
@@ -414,7 +341,7 @@ static unsigned int __devinit ata66_svwks_svwks (ide_hwif_t *hwif)
  * Bit 14 clear = primary IDE channel does not have 80-pin cable.
  * Bit 14 set   = primary IDE channel has 80-pin cable.
  */
-static unsigned int __devinit ata66_svwks_dell (ide_hwif_t *hwif)
+static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = hwif->pci_dev;
         if (dev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
@@ -422,8 +349,8 @@ static unsigned int __devinit ata66_svwks_dell (ide_hwif_t *hwif)
             (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE ||
              dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE))
                 return ((1 << (hwif->channel + 14)) &
-                        dev->subsystem_device) ? 1 : 0;
-        return 0;
+                        dev->subsystem_device) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
+        return ATA_CBL_PATA40;
 }
 
 /* Sun Cobalt Alpine hardware avoids the 80-pin cable
@@ -432,18 +359,18 @@ static unsigned int __devinit ata66_svwks_dell (ide_hwif_t *hwif)
  *
  * WARNING: this only works on Alpine hardware!
  */
-static unsigned int __devinit ata66_svwks_cobalt (ide_hwif_t *hwif)
+static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = hwif->pci_dev;
         if (dev->subsystem_vendor == PCI_VENDOR_ID_SUN &&
             dev->vendor == PCI_VENDOR_ID_SERVERWORKS &&
             dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
                 return ((1 << (hwif->channel + 14)) &
-                        dev->subsystem_device) ? 1 : 0;
-        return 0;
+                        dev->subsystem_device) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
+        return ATA_CBL_PATA40;
 }
 
-static unsigned int __devinit ata66_svwks (ide_hwif_t *hwif)
+static u8 __devinit ata66_svwks(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = hwif->pci_dev;
 
@@ -462,9 +389,9 @@ static unsigned int __devinit ata66_svwks (ide_hwif_t *hwif)
         /* Per Specified Design by OEM, and ASIC Architect */
         if ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||
             (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2))
-                return 1;
+                return ATA_CBL_PATA80;
 
-        return 0;
+        return ATA_CBL_PATA40;
 }
 
 static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
@@ -495,8 +422,8 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
 
         hwif->ide_dma_check = &svwks_config_drive_xfer_rate;
         if (hwif->pci_dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
-                if (!hwif->udma_four)
-                        hwif->udma_four = ata66_svwks(hwif);
+                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                        hwif->cbl = ata66_svwks(hwif);
         }
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index d3185e29a38e..d396b2929ed8 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -316,14 +316,6 @@ static void sgiioc4_dma_host_off(ide_drive_t * drive)
         sgiioc4_clearirq(drive);
 }
 
-static int
-sgiioc4_ide_dma_lostirq(ide_drive_t * drive)
-{
-        HWIF(drive)->resetproc(drive);
-
-        return __ide_dma_lostirq(drive);
-}
-
 static void
 sgiioc4_resetproc(ide_drive_t * drive)
 {
@@ -331,6 +323,14 @@ sgiioc4_resetproc(ide_drive_t * drive)
         sgiioc4_clearirq(drive);
 }
 
+static void
+sgiioc4_dma_lost_irq(ide_drive_t * drive)
+{
+        sgiioc4_resetproc(drive);
+
+        ide_dma_lost_irq(drive);
+}
+
 static u8
 sgiioc4_INB(unsigned long port)
 {
@@ -607,8 +607,8 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq;
         hwif->dma_host_on = &sgiioc4_dma_host_on;
         hwif->dma_host_off = &sgiioc4_dma_host_off;
-        hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
-        hwif->ide_dma_timeout = &__ide_dma_timeout;
+        hwif->dma_lost_irq = &sgiioc4_dma_lost_irq;
+        hwif->dma_timeout = &ide_dma_timeout;
 
         hwif->INB = &sgiioc4_INB;
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 1a4444e7226a..1c3e35487893 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -933,16 +933,17 @@ static void __devinit init_iops_siimage(ide_hwif_t *hwif)
  *      interface.
  */
 
-static unsigned int __devinit ata66_siimage(ide_hwif_t *hwif)
+static u8 __devinit ata66_siimage(ide_hwif_t *hwif)
 {
         unsigned long addr = siimage_selreg(hwif, 0);
-        if (pci_get_drvdata(hwif->pci_dev) == NULL) {
-                u8 ata66 = 0;
+        u8 ata66 = 0;
+
+        if (pci_get_drvdata(hwif->pci_dev) == NULL)
                 pci_read_config_byte(hwif->pci_dev, addr, &ata66);
-                return (ata66 & 0x01) ? 1 : 0;
-        }
+        else
+                ata66 = hwif->INB(addr);
 
-        return (hwif->INB(addr) & 0x01) ? 1 : 0;
+        return (ata66 & 0x01) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
 }
 
 /**
@@ -988,8 +989,9 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                 hwif->atapi_dma = 1;
 
         hwif->ide_dma_check = &siimage_config_drive_for_dma;
-        if (!(hwif->udma_four))
-                hwif->udma_four = ata66_siimage(hwif);
+
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = ata66_siimage(hwif);
 
         if (hwif->mmio) {
                 hwif->ide_dma_test_irq = &siimage_mmio_ide_dma_test_irq;
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index ec0adad9ef61..f875183ac8d9 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/sis5513.c      Version 0.20    Mar 4, 2007
+ * linux/drivers/ide/pci/sis5513.c      Version 0.25    Jun 10, 2007
  *
  * Copyright (C) 1999-2000      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2002           Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer
@@ -796,10 +796,33 @@ static unsigned int __devinit init_chipset_sis5513 (struct pci_dev *dev, const c
         return 0;
 }
 
-static unsigned int __devinit ata66_sis5513 (ide_hwif_t *hwif)
+struct sis_laptop {
+        u16 device;
+        u16 subvendor;
+        u16 subdevice;
+};
+
+static const struct sis_laptop sis_laptop[] = {
+        /* devid, subvendor, subdev */
+        { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
+        /* end marker */
+        { 0, }
+};
+
+static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
 {
+        struct pci_dev *pdev = hwif->pci_dev;
+        const struct sis_laptop *lap = &sis_laptop[0];
         u8 ata66 = 0;
 
+        while (lap->device) {
+                if (lap->device == pdev->device &&
+                    lap->subvendor == pdev->subsystem_vendor &&
+                    lap->subdevice == pdev->subsystem_device)
+                        return ATA_CBL_PATA40_SHORT;
+                lap++;
+        }
+
         if (chipset_family >= ATA_133) {
                 u16 regw = 0;
                 u16 reg_addr = hwif->channel ? 0x52: 0x50;
@@ -811,7 +834,8 @@ static unsigned int __devinit ata66_sis5513 (ide_hwif_t *hwif)
                 pci_read_config_byte(hwif->pci_dev, 0x48, &reg48h);
                 ata66 = (reg48h & mask) ? 0 : 1;
         }
-        return ata66;
+
+        return ata66 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
 }
 
 static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
@@ -841,8 +865,8 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
         if (!chipset_family)
                 return;
 
-        if (!(hwif->udma_four))
-                hwif->udma_four = ata66_sis5513(hwif);
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = ata66_sis5513(hwif);
 
         if (chipset_family > ATA_16) {
                 hwif->ide_dma_check = &sis5513_config_xfer_rate;
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 7c383d9cc472..487879842af4 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -195,7 +195,7 @@ static inline void sl82c105_reset_host(struct pci_dev *dev)
  * This function is called when the IDE timer expires, the drive
  * indicates that it is READY, and we were waiting for DMA to complete.
  */
-static int sl82c105_ide_dma_lostirq(ide_drive_t *drive)
+static void sl82c105_dma_lost_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
@@ -222,9 +222,6 @@ static int sl82c105_ide_dma_lostirq(ide_drive_t *drive)
         }
 
         sl82c105_reset_host(dev);
-
-        /* __ide_dma_lostirq would return 1, so we do as well */
-        return 1;
 }
 
 /*
@@ -244,15 +241,12 @@ static void sl82c105_dma_start(ide_drive_t *drive)
         ide_dma_start(drive);
 }
 
-static int sl82c105_ide_dma_timeout(ide_drive_t *drive)
+static void sl82c105_dma_timeout(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        DBG(("sl82c105_dma_timeout(drive:%s)\n", drive->name));
 
-        DBG(("sl82c105_ide_dma_timeout(drive:%s)\n", drive->name));
-
-        sl82c105_reset_host(dev);
-        return __ide_dma_timeout(drive);
+        sl82c105_reset_host(HWIF(drive)->pci_dev);
+        ide_dma_timeout(drive);
 }
 
 static int sl82c105_ide_dma_on(ide_drive_t *drive)
@@ -441,9 +435,9 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         hwif->ide_dma_check             = &sl82c105_ide_dma_check;
         hwif->ide_dma_on                = &sl82c105_ide_dma_on;
         hwif->dma_off_quietly           = &sl82c105_dma_off_quietly;
-        hwif->ide_dma_lostirq           = &sl82c105_ide_dma_lostirq;
+        hwif->dma_lost_irq              = &sl82c105_dma_lost_irq;
         hwif->dma_start                 = &sl82c105_dma_start;
-        hwif->ide_dma_timeout           = &sl82c105_ide_dma_timeout;
+        hwif->dma_timeout               = &sl82c105_dma_timeout;
 
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index c40f291f91e0..575dbbd8b482 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -199,10 +199,9 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
         hwif->mwdma_mask = 0x06;
         hwif->swdma_mask = 0x04;
 
-        if (!hwif->udma_four) {
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 /* bit[0(1)]: 0:80, 1:40 */
-                hwif->udma_four = (reg47 & mask) ? 0 : 1;
-        }
+                hwif->cbl = (reg47 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 
         hwif->ide_dma_check = &slc90e66_config_drive_xfer_rate;
 
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index cee619bb2eaf..8de1f8e22494 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -220,13 +220,13 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
         hwif->ide_dma_check     = &tc86c001_config_drive_xfer_rate;
         hwif->dma_start         = &tc86c001_dma_start;
 
-        if (!hwif->udma_four) {
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
                 /*
                  * System Control  1 Register bit 13 (PDIAGN):
                  * 0=80-pin cable, 1=40-pin cable
                  */
                 scr1 = hwif->INW(sc_base + 0x00);
-                hwif->udma_four = (scr1 & 0x2000) ? 0 : 1;
+                hwif->cbl = (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
         }
 
         if (!noautodma)
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index a508550c4095..d21dd2e7eeb3 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
  *
- * Version 3.38
+ * Version 3.45
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -9,6 +9,7 @@
  *   vt8235, vt8237, vt8237a
  *
  * Copyright (c) 2000-2002 Vojtech Pavlik
+ * Copyright (c) 2007 Bartlomiej Zolnierkiewicz
  *
  * Based on the work of:
  *      Michel Aubry
@@ -33,6 +34,8 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
+#include <linux/dmi.h>
+
 #include <asm/io.h>
 
 #ifdef CONFIG_PPC_CHRP
@@ -41,8 +44,6 @@
 
 #include "ide-timing.h"
 
-#define DISPLAY_VIA_TIMINGS
-
 #define VIA_IDE_ENABLE          0x40
 #define VIA_IDE_CONFIG          0x41
 #define VIA_FIFO_CONFIG         0x43
@@ -54,18 +55,12 @@
 #define VIA_ADDRESS_SETUP       0x4c
 #define VIA_UDMA_TIMING         0x50
 
-#define VIA_UDMA                0x007
-#define VIA_UDMA_NONE           0x000
-#define VIA_UDMA_33             0x001
-#define VIA_UDMA_66             0x002
-#define VIA_UDMA_100            0x003
-#define VIA_UDMA_133            0x004
-#define VIA_BAD_PREQ            0x010   /* Crashes if PREQ# till DDACK# set */
-#define VIA_BAD_CLK66           0x020   /* 66 MHz clock doesn't work correctly */
-#define VIA_SET_FIFO            0x040   /* Needs to have FIFO split set */
-#define VIA_NO_UNMASK           0x080   /* Doesn't work with IRQ unmasking on */
-#define VIA_BAD_ID              0x100   /* Has wrong vendor ID (0x1107) */
-#define VIA_BAD_AST             0x200   /* Don't touch Address Setup Timing */
+#define VIA_BAD_PREQ            0x01 /* Crashes if PREQ# till DDACK# set */
+#define VIA_BAD_CLK66           0x02 /* 66 MHz clock doesn't work correctly */
+#define VIA_SET_FIFO            0x04 /* Needs to have FIFO split set */
+#define VIA_NO_UNMASK           0x08 /* Doesn't work with IRQ unmasking on */
+#define VIA_BAD_ID              0x10 /* Has wrong vendor ID (0x1107) */
+#define VIA_BAD_AST             0x20 /* Don't touch Address Setup Timing */
 
 /*
  * VIA SouthBridge chips.
@@ -76,36 +71,37 @@ static struct via_isa_bridge {
         u16 id;
         u8 rev_min;
         u8 rev_max;
-        u16 flags;
+        u8 udma_mask;
+        u8 flags;
 } via_isa_bridges[] = {
-        { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8237",     PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8237a",    PCI_DEVICE_ID_VIA_8237A,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8235",     PCI_DEVICE_ID_VIA_8235,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8233a",    PCI_DEVICE_ID_VIA_8233A,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
-        { "vt8233c",    PCI_DEVICE_ID_VIA_8233C_0,  0x00, 0x2f, VIA_UDMA_100 },
-        { "vt8233",     PCI_DEVICE_ID_VIA_8233_0,   0x00, 0x2f, VIA_UDMA_100 },
-        { "vt8231",     PCI_DEVICE_ID_VIA_8231,     0x00, 0x2f, VIA_UDMA_100 },
-        { "vt82c686b",  PCI_DEVICE_ID_VIA_82C686,   0x40, 0x4f, VIA_UDMA_100 },
-        { "vt82c686a",  PCI_DEVICE_ID_VIA_82C686,   0x10, 0x2f, VIA_UDMA_66 },
-        { "vt82c686",   PCI_DEVICE_ID_VIA_82C686,   0x00, 0x0f, VIA_UDMA_33 | VIA_BAD_CLK66 },
-        { "vt82c596b",  PCI_DEVICE_ID_VIA_82C596,   0x10, 0x2f, VIA_UDMA_66 },
-        { "vt82c596a",  PCI_DEVICE_ID_VIA_82C596,   0x00, 0x0f, VIA_UDMA_33 | VIA_BAD_CLK66 },
-        { "vt82c586b",  PCI_DEVICE_ID_VIA_82C586_0, 0x47, 0x4f, VIA_UDMA_33 | VIA_SET_FIFO },
-        { "vt82c586b",  PCI_DEVICE_ID_VIA_82C586_0, 0x40, 0x46, VIA_UDMA_33 | VIA_SET_FIFO | VIA_BAD_PREQ },
-        { "vt82c586b",  PCI_DEVICE_ID_VIA_82C586_0, 0x30, 0x3f, VIA_UDMA_33 | VIA_SET_FIFO },
-        { "vt82c586a",  PCI_DEVICE_ID_VIA_82C586_0, 0x20, 0x2f, VIA_UDMA_33 | VIA_SET_FIFO },
-        { "vt82c586",   PCI_DEVICE_ID_VIA_82C586_0, 0x00, 0x0f, VIA_UDMA_NONE | VIA_SET_FIFO },
-        { "vt82c576",   PCI_DEVICE_ID_VIA_82C576,   0x00, 0x2f, VIA_UDMA_NONE | VIA_SET_FIFO | VIA_NO_UNMASK },
-        { "vt82c576",   PCI_DEVICE_ID_VIA_82C576,   0x00, 0x2f, VIA_UDMA_NONE | VIA_SET_FIFO | VIA_NO_UNMASK | VIA_BAD_ID },
+        { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8237",     PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8237a",    PCI_DEVICE_ID_VIA_8237A,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8235",     PCI_DEVICE_ID_VIA_8235,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8233a",    PCI_DEVICE_ID_VIA_8233A,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
+        { "vt8233c",    PCI_DEVICE_ID_VIA_8233C_0,  0x00, 0x2f, ATA_UDMA5, },
+        { "vt8233",     PCI_DEVICE_ID_VIA_8233_0,   0x00, 0x2f, ATA_UDMA5, },
+        { "vt8231",     PCI_DEVICE_ID_VIA_8231,     0x00, 0x2f, ATA_UDMA5, },
+        { "vt82c686b",  PCI_DEVICE_ID_VIA_82C686,   0x40, 0x4f, ATA_UDMA5, },
+        { "vt82c686a",  PCI_DEVICE_ID_VIA_82C686,   0x10, 0x2f, ATA_UDMA4, },
+        { "vt82c686",   PCI_DEVICE_ID_VIA_82C686,   0x00, 0x0f, ATA_UDMA2, VIA_BAD_CLK66 },
+        { "vt82c596b",  PCI_DEVICE_ID_VIA_82C596,   0x10, 0x2f, ATA_UDMA4, },
+        { "vt82c596a",  PCI_DEVICE_ID_VIA_82C596,   0x00, 0x0f, ATA_UDMA2, VIA_BAD_CLK66 },
+        { "vt82c586b",  PCI_DEVICE_ID_VIA_82C586_0, 0x47, 0x4f, ATA_UDMA2, VIA_SET_FIFO },
+        { "vt82c586b",  PCI_DEVICE_ID_VIA_82C586_0, 0x40, 0x46, ATA_UDMA2, VIA_SET_FIFO | VIA_BAD_PREQ },
+        { "vt82c586b",  PCI_DEVICE_ID_VIA_82C586_0, 0x30, 0x3f, ATA_UDMA2, VIA_SET_FIFO },
+        { "vt82c586a",  PCI_DEVICE_ID_VIA_82C586_0, 0x20, 0x2f, ATA_UDMA2, VIA_SET_FIFO },
+        { "vt82c586",   PCI_DEVICE_ID_VIA_82C586_0, 0x00, 0x0f,      0x00, VIA_SET_FIFO },
+        { "vt82c576",   PCI_DEVICE_ID_VIA_82C576,   0x00, 0x2f,      0x00, VIA_SET_FIFO | VIA_NO_UNMASK },
+        { "vt82c576",   PCI_DEVICE_ID_VIA_82C576,   0x00, 0x2f,      0x00, VIA_SET_FIFO | VIA_NO_UNMASK | VIA_BAD_ID },
         { NULL }
 };
 
 static unsigned int via_clock;
-static char *via_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" };
+static char *via_dma[] = { "16", "25", "33", "44", "66", "100", "133" };
 
 struct via82cxxx_dev
 {
@@ -140,12 +136,12 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
         pci_write_config_byte(dev, VIA_DRIVE_TIMING + (3 - dn),
                 ((FIT(timing->active, 1, 16) - 1) << 4) | (FIT(timing->recover, 1, 16) - 1));
 
-        switch (vdev->via_config->flags & VIA_UDMA) {
-                case VIA_UDMA_33:  t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
-                case VIA_UDMA_66:  t = timing->udma ? (0xe8 | (FIT(timing->udma, 2, 9) - 2)) : 0x0f; break;
-                case VIA_UDMA_100: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
-                case VIA_UDMA_133: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
-                default: return;
+        switch (vdev->via_config->udma_mask) {
+        case ATA_UDMA2: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
+        case ATA_UDMA4: t = timing->udma ? (0xe8 | (FIT(timing->udma, 2, 9) - 2)) : 0x0f; break;
+        case ATA_UDMA5: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
+        case ATA_UDMA6: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
+        default: return;
         }
 
         pci_write_config_byte(dev, VIA_UDMA_TIMING + (3 - dn), t);
@@ -173,12 +169,12 @@ static int via_set_drive(ide_drive_t *drive, u8 speed)
 
         T = 1000000000 / via_clock;
 
-        switch (vdev->via_config->flags & VIA_UDMA) {
-                case VIA_UDMA_33:   UT = T;   break;
-                case VIA_UDMA_66:   UT = T/2; break;
-                case VIA_UDMA_100:  UT = T/3; break;
-                case VIA_UDMA_133:  UT = T/4; break;
-                default: UT = T;
+        switch (vdev->via_config->udma_mask) {
+        case ATA_UDMA2: UT = T;   break;
+        case ATA_UDMA4: UT = T/2; break;
+        case ATA_UDMA5: UT = T/3; break;
+        case ATA_UDMA6: UT = T/4; break;
+        default:        UT = T;
         }
 
         ide_timing_compute(drive, speed, &t, T, UT);
@@ -208,8 +204,7 @@ static int via_set_drive(ide_drive_t *drive, u8 speed)
 static void via82cxxx_tune_drive(ide_drive_t *drive, u8 pio)
 {
         if (pio == 255) {
-                via_set_drive(drive,
-                        ide_find_best_mode(drive, XFER_PIO | XFER_EPIO));
+                via_set_drive(drive, ide_find_best_pio_mode(drive));
                 return;
         }
 
@@ -226,16 +221,10 @@ static void via82cxxx_tune_drive(ide_drive_t *drive, u8 pio)
  
 static int via82cxxx_ide_dma_check (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
-        u16 w80 = hwif->udma_four;
+        u8 speed = ide_max_dma_mode(drive);
 
-        u16 speed = ide_find_best_mode(drive,
-                XFER_PIO | XFER_EPIO | XFER_SWDMA | XFER_MWDMA |
-                (vdev->via_config->flags & VIA_UDMA ? XFER_UDMA : 0) |
-                (w80 && (vdev->via_config->flags & VIA_UDMA) >= VIA_UDMA_66 ? XFER_UDMA_66 : 0) |
-                (w80 && (vdev->via_config->flags & VIA_UDMA) >= VIA_UDMA_100 ? XFER_UDMA_100 : 0) |
-                (w80 && (vdev->via_config->flags & VIA_UDMA) >= VIA_UDMA_133 ? XFER_UDMA_133 : 0));
+        if (speed == 0)
+                speed = ide_find_best_pio_mode(drive);
 
         via_set_drive(drive, speed);
 
@@ -272,8 +261,8 @@ static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)
 {
         int i;
 
-        switch (vdev->via_config->flags & VIA_UDMA) {
-                case VIA_UDMA_66:
+        switch (vdev->via_config->udma_mask) {
+                case ATA_UDMA4:
                         for (i = 24; i >= 0; i -= 8)
                                 if (((u >> (i & 16)) & 8) &&
                                     ((u >> i) & 0x20) &&
@@ -286,7 +275,7 @@ static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)
                                 }
                         break;
 
-                case VIA_UDMA_100:
+                case ATA_UDMA5:
                         for (i = 24; i >= 0; i -= 8)
                                 if (((u >> i) & 0x10) ||
                                     (((u >> i) & 0x20) &&
@@ -298,7 +287,7 @@ static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)
                                 }
                         break;
 
-                case VIA_UDMA_133:
+                case ATA_UDMA6:
                         for (i = 24; i >= 0; i -= 8)
                                 if (((u >> i) & 0x10) ||
                                     (((u >> i) & 0x20) &&
@@ -353,7 +342,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
 
         via_cable_detect(vdev, u);
 
-        if ((via_config->flags & VIA_UDMA) == VIA_UDMA_66) {
+        if (via_config->udma_mask == ATA_UDMA4) {
                 /* Enable Clk66 */
                 pci_write_config_dword(dev, VIA_UDMA_TIMING, u|0x80008);
         } else if (via_config->flags & VIA_BAD_CLK66) {
@@ -416,16 +405,54 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
          */
 
         pci_read_config_byte(isa, PCI_REVISION_ID, &t);
-        printk(KERN_INFO "VP_IDE: VIA %s (rev %02x) IDE %s "
+        printk(KERN_INFO "VP_IDE: VIA %s (rev %02x) IDE %sDMA%s "
                 "controller on pci%s\n",
                 via_config->name, t,
-                via_dma[via_config->flags & VIA_UDMA],
+                via_config->udma_mask ? "U" : "MW",
+                via_dma[via_config->udma_mask ?
+                        (fls(via_config->udma_mask) - 1) : 0],
                 pci_name(dev));
 
         pci_dev_put(isa);
         return 0;
 }
 
+/*
+ *      Cable special cases
+ */
+
+static struct dmi_system_id cable_dmi_table[] = {
+        {
+                .ident = "Acer Ferrari 3400",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer,Inc."),
+                        DMI_MATCH(DMI_BOARD_NAME, "Ferrari 3400"),
+                },
+        },
+        { }
+};
+
+static int via_cable_override(void)
+{
+        /* Systems by DMI */
+        if (dmi_check_system(cable_dmi_table))
+                return 1;
+        return 0;
+}
+
+static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
+{
+        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
+
+        if (via_cable_override())
+                return ATA_CBL_PATA40_SHORT;
+
+        if ((vdev->via_80w >> hwif->channel) & 1)
+                return ATA_CBL_PATA80;
+        else
+                return ATA_CBL_PATA40;
+}
+
 static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 {
         struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
@@ -454,12 +481,14 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
                 return;
 
         hwif->atapi_dma = 1;
-        hwif->ultra_mask = 0x7f;
+
+        hwif->ultra_mask = vdev->via_config->udma_mask;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
 
-        if (!hwif->udma_four)
-                hwif->udma_four = (vdev->via_80w >> hwif->channel) & 1;
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = via82cxxx_cable_detect(hwif);
+
         hwif->ide_dma_check = &via82cxxx_ide_dma_check;
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 45fc36f0f219..e46f47206542 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -942,8 +942,8 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed)
                                 return 1;
                 case XFER_UDMA_4:
                 case XFER_UDMA_3:
-                        if (HWIF(drive)->udma_four == 0)
-                                return 1;               
+                        if (drive->hwif->cbl != ATA_CBL_PATA80)
+                                return 1;
                 case XFER_UDMA_2:
                 case XFER_UDMA_1:
                 case XFER_UDMA_0:
@@ -1244,7 +1244,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         hwif->chipset = ide_pmac;
         hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay;
         hwif->hold = pmif->mediabay;
-        hwif->udma_four = pmif->cable_80;
+        hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
         hwif->drives[0].unmask = 1;
         hwif->drives[1].unmask = 1;
         hwif->tuneproc = pmac_ide_tuneproc;
@@ -1821,28 +1821,11 @@ pmac_ide_dma_check(ide_drive_t *drive)
                 enable = 0;
 
         if (enable) {
-                short mode;
-                
-                map = XFER_MWDMA;
-                if (pmif->kind == controller_kl_ata4
-                    || pmif->kind == controller_un_ata6
-                    || pmif->kind == controller_k2_ata6
-                    || pmif->kind == controller_sh_ata6) {
-                        map |= XFER_UDMA;
-                        if (pmif->cable_80) {
-                                map |= XFER_UDMA_66;
-                                if (pmif->kind == controller_un_ata6 ||
-                                    pmif->kind == controller_k2_ata6 ||
-                                    pmif->kind == controller_sh_ata6)
-                                        map |= XFER_UDMA_100;
-                                if (pmif->kind == controller_sh_ata6)
-                                        map |= XFER_UDMA_133;
-                        }
-                }
-                mode = ide_find_best_mode(drive, map);
-                if (mode & XFER_UDMA)
+                u8 mode = ide_max_dma_mode(drive);
+
+                if (mode >= XFER_UDMA_0)
                         drive->using_dma = pmac_ide_udma_enable(drive, mode);
-                else if (mode & XFER_MWDMA)
+                else if (mode >= XFER_MW_DMA_0)
                         drive->using_dma = pmac_ide_mdma_enable(drive, mode);
                 hwif->OUTB(0, IDE_CONTROL_REG);
                 /* Apply settings to controller */
@@ -2004,20 +1987,19 @@ static void pmac_ide_dma_host_on(ide_drive_t *drive)
 {
 }
 
-static int
-pmac_ide_dma_lostirq (ide_drive_t *drive)
+static void
+pmac_ide_dma_lost_irq (ide_drive_t *drive)
 {
         pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data;
         volatile struct dbdma_regs __iomem *dma;
         unsigned long status;
 
         if (pmif == NULL)
-                return 0;
+                return;
         dma = pmif->dma_regs;
 
         status = readl(&dma->status);
         printk(KERN_ERR "ide-pmac lost interrupt, dma status: %lx\n", status);
-        return 0;
 }
 
 /*
@@ -2057,8 +2039,8 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq;
         hwif->dma_host_off = &pmac_ide_dma_host_off;
         hwif->dma_host_on = &pmac_ide_dma_host_on;
-        hwif->ide_dma_timeout = &__ide_dma_timeout;
-        hwif->ide_dma_lostirq = &pmac_ide_dma_lostirq;
+        hwif->dma_timeout = &ide_dma_timeout;
+        hwif->dma_lost_irq = &pmac_ide_dma_lost_irq;
 
         hwif->atapi_dma = 1;
         switch(pmif->kind) {
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 616eee9c04f1..bd601efa7bd1 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -34,6 +34,11 @@ config PHANTOM
           If you choose to build module, its name will be phantom. If unsure,
           say N here.
 
+config EEPROM_93CX6
+        tristate "EEPROM 93CX6 support"
+        ---help---
+          This is a driver for the EEPROM chipsets 93c46 and 93c66.
+          The driver supports both read as well as write commands.
 
           If unsure, say N.
 
@@ -187,5 +192,4 @@ config THINKPAD_ACPI_BAY
 
           If you are not sure, say Y here.
 
-
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 8abbf2f07a65..b5ce0e3dba86 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_PHANTOM)		+= phantom.o
 obj-$(CONFIG_SGI_IOC4)          += ioc4.o
 obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
 obj-$(CONFIG_THINKPAD_ACPI)     += thinkpad_acpi.o
+obj-$(CONFIG_EEPROM_93CX6)      += eeprom_93cx6.o
diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c
new file mode 100644
index 000000000000..ac515b0ef67c
--- /dev/null
+++ b/drivers/misc/eeprom_93cx6.c
@@ -0,0 +1,241 @@
+/*
+        Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
+        <http://rt2x00.serialmonkey.com>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the
+        Free Software Foundation, Inc.,
+        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+        Module: eeprom_93cx6
+        Abstract: EEPROM reader routines for 93cx6 chipsets.
+        Supported chipsets: 93c46 & 93c66.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/delay.h>
+#include <linux/eeprom_93cx6.h>
+
+MODULE_AUTHOR("http://rt2x00.serialmonkey.com");
+MODULE_VERSION("1.0");
+MODULE_DESCRIPTION("EEPROM 93cx6 chip driver");
+MODULE_LICENSE("GPL");
+
+static inline void eeprom_93cx6_pulse_high(struct eeprom_93cx6 *eeprom)
+{
+        eeprom->reg_data_clock = 1;
+        eeprom->register_write(eeprom);
+
+        /*
+         * Add a short delay for the pulse to work.
+         * According to the specifications the "maximum minimum"
+         * time should be 450ns.
+         */
+        ndelay(450);
+}
+
+static inline void eeprom_93cx6_pulse_low(struct eeprom_93cx6 *eeprom)
+{
+        eeprom->reg_data_clock = 0;
+        eeprom->register_write(eeprom);
+
+        /*
+         * Add a short delay for the pulse to work.
+         * According to the specifications the minimal time
+         * should be 450ns so a 1us delay is sufficient.
+         */
+        udelay(1);
+}
+
+static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)
+{
+        /*
+         * Clear all flags, and enable chip select.
+         */
+        eeprom->register_read(eeprom);
+        eeprom->reg_data_in = 0;
+        eeprom->reg_data_out = 0;
+        eeprom->reg_data_clock = 0;
+        eeprom->reg_chip_select = 1;
+        eeprom->register_write(eeprom);
+
+        /*
+         * kick a pulse.
+         */
+        eeprom_93cx6_pulse_high(eeprom);
+        eeprom_93cx6_pulse_low(eeprom);
+}
+
+static void eeprom_93cx6_cleanup(struct eeprom_93cx6 *eeprom)
+{
+        /*
+         * Clear chip_select and data_in flags.
+         */
+        eeprom->register_read(eeprom);
+        eeprom->reg_data_in = 0;
+        eeprom->reg_chip_select = 0;
+        eeprom->register_write(eeprom);
+
+        /*
+         * kick a pulse.
+         */
+        eeprom_93cx6_pulse_high(eeprom);
+        eeprom_93cx6_pulse_low(eeprom);
+}
+
+static void eeprom_93cx6_write_bits(struct eeprom_93cx6 *eeprom,
+        const u16 data, const u16 count)
+{
+        unsigned int i;
+
+        eeprom->register_read(eeprom);
+
+        /*
+         * Clear data flags.
+         */
+        eeprom->reg_data_in = 0;
+        eeprom->reg_data_out = 0;
+
+        /*
+         * Start writing all bits.
+         */
+        for (i = count; i > 0; i--) {
+                /*
+                 * Check if this bit needs to be set.
+                 */
+                eeprom->reg_data_in = !!(data & (1 << (i - 1)));
+
+                /*
+                 * Write the bit to the eeprom register.
+                 */
+                eeprom->register_write(eeprom);
+
+                /*
+                 * Kick a pulse.
+                 */
+                eeprom_93cx6_pulse_high(eeprom);
+                eeprom_93cx6_pulse_low(eeprom);
+        }
+
+        eeprom->reg_data_in = 0;
+        eeprom->register_write(eeprom);
+}
+
+static void eeprom_93cx6_read_bits(struct eeprom_93cx6 *eeprom,
+        u16 *data, const u16 count)
+{
+        unsigned int i;
+        u16 buf = 0;
+
+        eeprom->register_read(eeprom);
+
+        /*
+         * Clear data flags.
+         */
+        eeprom->reg_data_in = 0;
+        eeprom->reg_data_out = 0;
+
+        /*
+         * Start reading all bits.
+         */
+        for (i = count; i > 0; i--) {
+                eeprom_93cx6_pulse_high(eeprom);
+
+                eeprom->register_read(eeprom);
+
+                /*
+                 * Clear data_in flag.
+                 */
+                eeprom->reg_data_in = 0;
+
+                /*
+                 * Read if the bit has been set.
+                 */
+                if (eeprom->reg_data_out)
+                        buf |= (1 << (i - 1));
+
+                eeprom_93cx6_pulse_low(eeprom);
+        }
+
+        *data = buf;
+}
+
+/**
+ * eeprom_93cx6_read - Read multiple words from eeprom
+ * @eeprom: Pointer to eeprom structure
+ * @word: Word index from where we should start reading
+ * @data: target pointer where the information will have to be stored
+ *
+ * This function will read the eeprom data as host-endian word
+ * into the given data pointer.
+ */
+void eeprom_93cx6_read(struct eeprom_93cx6 *eeprom, const u8 word,
+        u16 *data)
+{
+        u16 command;
+
+        /*
+         * Initialize the eeprom register
+         */
+        eeprom_93cx6_startup(eeprom);
+
+        /*
+         * Select the read opcode and the word to be read.
+         */
+        command = (PCI_EEPROM_READ_OPCODE << eeprom->width) | word;
+        eeprom_93cx6_write_bits(eeprom, command,
+                PCI_EEPROM_WIDTH_OPCODE + eeprom->width);
+
+        /*
+         * Read the requested 16 bits.
+         */
+        eeprom_93cx6_read_bits(eeprom, data, 16);
+
+        /*
+         * Cleanup eeprom register.
+         */
+        eeprom_93cx6_cleanup(eeprom);
+}
+EXPORT_SYMBOL_GPL(eeprom_93cx6_read);
+
+/**
+ * eeprom_93cx6_multiread - Read multiple words from eeprom
+ * @eeprom: Pointer to eeprom structure
+ * @word: Word index from where we should start reading
+ * @data: target pointer where the information will have to be stored
+ * @words: Number of words that should be read.
+ *
+ * This function will read all requested words from the eeprom,
+ * this is done by calling eeprom_93cx6_read() multiple times.
+ * But with the additional change that while the eeprom_93cx6_read
+ * will return host ordered bytes, this method will return little
+ * endian words.
+ */
+void eeprom_93cx6_multiread(struct eeprom_93cx6 *eeprom, const u8 word,
+        __le16 *data, const u16 words)
+{
+        unsigned int i;
+        u16 tmp;
+
+        for (i = 0; i < words; i++) {
+                tmp = 0;
+                eeprom_93cx6_read(eeprom, word + i, &tmp);
+                data[i] = cpu_to_le16(tmp);
+        }
+}
+EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread);
+
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a804965e6542..58bbc3e6d0de 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -107,11 +107,6 @@ MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered mu
 
 #define PFX                     DRV_NAME ": "
 
-#ifndef TRUE
-#define FALSE 0
-#define TRUE (!FALSE)
-#endif
-
 #define CP_DEF_MSG_ENABLE       (NETIF_MSG_DRV          | \
                                  NETIF_MSG_PROBE        | \
                                  NETIF_MSG_LINK)
@@ -661,7 +656,7 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
         if (status & (TxOK | TxErr | TxEmpty | SWInt))
                 cp_tx(cp);
         if (status & LinkChg)
-                mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE);
+                mii_check_media(&cp->mii_if, netif_msg_link(cp), false);
 
         spin_unlock(&cp->lock);
 
@@ -1188,7 +1183,7 @@ static int cp_open (struct net_device *dev)
                 goto err_out_hw;
 
         netif_carrier_off(dev);
-        mii_check_media(&cp->mii_if, netif_msg_link(cp), TRUE);
+        mii_check_media(&cp->mii_if, netif_msg_link(cp), true);
         netif_start_queue(dev);
 
         return 0;
@@ -2050,7 +2045,7 @@ static int cp_resume (struct pci_dev *pdev)
 
         spin_lock_irqsave (&cp->lock, flags);
 
-        mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE);
+        mii_check_media(&cp->mii_if, netif_msg_link(cp), false);
 
         spin_unlock_irqrestore (&cp->lock, flags);
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b49375abb5f4..5cc3d517e39b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3,10 +3,7 @@
 # Network device configuration
 #
 
-menu "Network device support"
-        depends on NET
-
-config NETDEVICES
+menuconfig NETDEVICES
         default y if UML
         bool "Network device support"
         ---help---
@@ -151,11 +148,9 @@ source "drivers/net/phy/Kconfig"
 #       Ethernet
 #
 
-menu "Ethernet (10 or 100Mbit)"
-        depends on !UML
-
-config NET_ETHERNET
+menuconfig NET_ETHERNET
         bool "Ethernet (10 or 100Mbit)"
+        depends on !UML
         ---help---
           Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
           type of Local Area Network (LAN) in universities and companies.
@@ -180,9 +175,10 @@ config NET_ETHERNET
           kernel: saying N will just cause the configurator to skip all
           the questions about Ethernet network cards. If unsure, say N.
 
+if NET_ETHERNET
+
 config MII
         tristate "Generic Media Independent Interface device support"
-        depends on NET_ETHERNET
         help
           Most ethernet controllers have MII transceiver either as an external
           or internal device.  It is safe to say Y or M here even if your
@@ -190,7 +186,7 @@ config MII
 
 config MACB
         tristate "Atmel MACB support"
-        depends on NET_ETHERNET && (AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263)
+        depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263
         select MII
         help
           The Atmel MACB ethernet interface is found on many AT32 and AT91
@@ -203,7 +199,7 @@ source "drivers/net/arm/Kconfig"
 
 config MACE
         tristate "MACE (Power Mac ethernet) support"
-        depends on NET_ETHERNET && PPC_PMAC && PPC32
+        depends on PPC_PMAC && PPC32
         select CRC32
         help
           Power Macintoshes and clones with Ethernet built-in on the
@@ -226,7 +222,7 @@ config MACE_AAUI_PORT
 
 config BMAC
         tristate "BMAC (G3 ethernet) support"
-        depends on NET_ETHERNET && PPC_PMAC && PPC32
+        depends on PPC_PMAC && PPC32
         select CRC32
         help
           Say Y for support of BMAC Ethernet interfaces. These are used on G3
@@ -237,7 +233,7 @@ config BMAC
 
 config ARIADNE
         tristate "Ariadne support"
-        depends on NET_ETHERNET && ZORRO
+        depends on ZORRO
         help
           If you have a Village Tronic Ariadne Ethernet adapter, say Y.
           Otherwise, say N.
@@ -247,7 +243,7 @@ config ARIADNE
 
 config A2065
         tristate "A2065 support"
-        depends on NET_ETHERNET && ZORRO
+        depends on ZORRO
         select CRC32
         help
           If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
@@ -258,7 +254,7 @@ config A2065
 
 config HYDRA
         tristate "Hydra support"
-        depends on NET_ETHERNET && ZORRO
+        depends on ZORRO
         select CRC32
         help
           If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
@@ -268,7 +264,7 @@ config HYDRA
 
 config ZORRO8390
         tristate "Zorro NS8390-based Ethernet support"
-        depends on NET_ETHERNET && ZORRO
+        depends on ZORRO
         select CRC32
         help
           This driver is for Zorro Ethernet cards using an NS8390-compatible
@@ -281,7 +277,7 @@ config ZORRO8390
 
 config APNE
         tristate "PCMCIA NE2000 support"
-        depends on NET_ETHERNET && AMIGA_PCMCIA
+        depends on AMIGA_PCMCIA
         select CRC32
         help
           If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
@@ -292,7 +288,7 @@ config APNE
 
 config APOLLO_ELPLUS
         tristate "Apollo 3c505 support"
-        depends on NET_ETHERNET && APOLLO
+        depends on APOLLO
         help
           Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card.
           If you don't have one made for Apollos, you can use one from a PC,
@@ -301,7 +297,7 @@ config APOLLO_ELPLUS
 
 config MAC8390
         bool "Macintosh NS 8390 based ethernet cards"
-        depends on NET_ETHERNET && MAC
+        depends on MAC
         select CRC32
         help
           If you want to include a driver to support Nubus or LC-PDS
@@ -311,7 +307,7 @@ config MAC8390
 
 config MAC89x0
         tristate "Macintosh CS89x0 based ethernet cards"
-        depends on NET_ETHERNET && MAC
+        depends on MAC
         ---help---
           Support for CS89x0 chipset based Ethernet cards.  If you have a
           Nubus or LC-PDS network (Ethernet) card of this type, say Y and
@@ -324,7 +320,7 @@ config MAC89x0
 
 config MACSONIC
         tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
-        depends on NET_ETHERNET && MAC
+        depends on MAC
         ---help---
           Support for NatSemi SONIC based Ethernet devices.  This includes
           the onboard Ethernet in many Quadras as well as some LC-PDS,
@@ -338,7 +334,7 @@ config MACSONIC
 
 config MACMACE
         bool "Macintosh (AV) onboard MACE ethernet"
-        depends on NET_ETHERNET && MAC
+        depends on MAC
         select CRC32
         help
           Support for the onboard AMD 79C940 MACE Ethernet controller used in
@@ -348,7 +344,7 @@ config MACMACE
 
 config MVME147_NET
         tristate "MVME147 (Lance) Ethernet support"
-        depends on NET_ETHERNET && MVME147
+        depends on MVME147
         select CRC32
         help
           Support for the on-board Ethernet interface on the Motorola MVME147
@@ -358,7 +354,7 @@ config MVME147_NET
 
 config MVME16x_NET
         tristate "MVME16x Ethernet support"
-        depends on NET_ETHERNET && MVME16x
+        depends on MVME16x
         help
           This is the driver for the Ethernet interface on the Motorola
           MVME162, 166, 167, 172 and 177 boards.  Say Y here to include the
@@ -367,7 +363,7 @@ config MVME16x_NET
 
 config BVME6000_NET
         tristate "BVME6000 Ethernet support"
-        depends on NET_ETHERNET && BVME6000
+        depends on BVME6000
         help
           This is the driver for the Ethernet interface on BVME4000 and
           BVME6000 VME boards.  Say Y here to include the driver for this chip
@@ -376,7 +372,7 @@ config BVME6000_NET
 
 config ATARILANCE
         tristate "Atari Lance support"
-        depends on NET_ETHERNET && ATARI
+        depends on ATARI
         help
           Say Y to include support for several Atari Ethernet adapters based
           on the AMD Lance chipset: RieblCard (with or without battery), or
@@ -384,7 +380,7 @@ config ATARILANCE
 
 config ATARI_BIONET
         tristate "BioNet-100 support"
-        depends on NET_ETHERNET && ATARI && ATARI_ACSI && BROKEN
+        depends on ATARI && ATARI_ACSI && BROKEN
         help
           Say Y to include support for BioData's BioNet-100 Ethernet adapter
           for the ACSI port. The driver works (has to work...) with a polled
@@ -392,7 +388,7 @@ config ATARI_BIONET
 
 config ATARI_PAMSNET
         tristate "PAMsNet support"
-        depends on NET_ETHERNET && ATARI && ATARI_ACSI && BROKEN
+        depends on ATARI && ATARI_ACSI && BROKEN
         help
           Say Y to include support for the PAMsNet Ethernet adapter for the
           ACSI port ("ACSI node"). The driver works (has to work...) with a
@@ -400,7 +396,7 @@ config ATARI_PAMSNET
 
 config SUN3LANCE
         tristate "Sun3/Sun3x on-board LANCE support"
-        depends on NET_ETHERNET && (SUN3 || SUN3X)
+        depends on SUN3 || SUN3X
         help
           Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
           featured an AMD Lance 10Mbit Ethernet controller on board; say Y
@@ -413,7 +409,7 @@ config SUN3LANCE
 
 config SUN3_82586
         bool "Sun3 on-board Intel 82586 support"
-        depends on NET_ETHERNET && SUN3
+        depends on SUN3
         help
           This driver enables support for the on-board Intel 82586 based
           Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
@@ -422,7 +418,7 @@ config SUN3_82586
 
 config HPLANCE
         bool "HP on-board LANCE support"
-        depends on NET_ETHERNET && DIO
+        depends on DIO
         select CRC32
         help
           If you want to use the builtin "LANCE" Ethernet controller on an
@@ -430,21 +426,28 @@ config HPLANCE
 
 config LASI_82596
         tristate "Lasi ethernet"
-        depends on NET_ETHERNET && GSC
+        depends on GSC
         help
           Say Y here to support the builtin Intel 82596 ethernet controller
           found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
 
+config SNI_82596
+        tristate "SNI RM ethernet"
+        depends on NET_ETHERNET && SNI_RM
+        help
+          Say Y here to support the on-board Intel 82596 ethernet controller
+          built into SNI RM machines.
+
 config MIPS_JAZZ_SONIC
         tristate "MIPS JAZZ onboard SONIC Ethernet support"
-        depends on NET_ETHERNET && MACH_JAZZ
+        depends on MACH_JAZZ
         help
           This is the driver for the onboard card of MIPS Magnum 4000,
           Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
 
 config MIPS_AU1X00_ENET
         bool "MIPS AU1000 Ethernet support"
-        depends on NET_ETHERNET && SOC_AU1X00
+        depends on SOC_AU1X00
         select PHYLIB
         select CRC32
         help
@@ -453,11 +456,11 @@ config MIPS_AU1X00_ENET
 
 config NET_SB1250_MAC
         tristate "SB1250 Ethernet support"
-        depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC
+        depends on SIBYTE_SB1xxx_SOC
 
 config SGI_IOC3_ETH
         bool "SGI IOC3 Ethernet"
-        depends on NET_ETHERNET && PCI && SGI_IP27
+        depends on PCI && SGI_IP27
         select CRC32
         select MII
         help
@@ -487,7 +490,7 @@ config SGI_IOC3_ETH_HW_TX_CSUM
 
 config MIPS_SIM_NET
         tristate "MIPS simulator Network device"
-        depends on NET_ETHERNET && MIPS_SIM
+        depends on MIPS_SIM
         help
           The MIPSNET device is a simple Ethernet network device which is
           emulated by the MIPS Simulator.
@@ -495,11 +498,11 @@ config MIPS_SIM_NET
 
 config SGI_O2MACE_ETH
         tristate "SGI O2 MACE Fast Ethernet support"
-        depends on NET_ETHERNET && SGI_IP32=y
+        depends on SGI_IP32=y
 
 config STNIC
         tristate "National DP83902AV  support"
-        depends on NET_ETHERNET && SUPERH
+        depends on SUPERH
         select CRC32
         help
           Support for cards based on the National Semiconductor DP83902AV
@@ -511,7 +514,7 @@ config STNIC
 
 config SUNLANCE
         tristate "Sun LANCE support"
-        depends on NET_ETHERNET && SBUS
+        depends on SBUS
         select CRC32
         help
           This driver supports the "le" interface present on all 32-bit Sparc
@@ -524,7 +527,7 @@ config SUNLANCE
 
 config HAPPYMEAL
         tristate "Sun Happy Meal 10/100baseT support"
-        depends on NET_ETHERNET && (SBUS || PCI)
+        depends on SBUS || PCI
         select CRC32
         help
           This driver supports the "hme" interface present on most Ultra
@@ -537,7 +540,7 @@ config HAPPYMEAL
 
 config SUNBMAC
         tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
-        depends on NET_ETHERNET && SBUS && EXPERIMENTAL
+        depends on SBUS && EXPERIMENTAL
         select CRC32
         help
           This driver supports the "be" interface available as an Sbus option.
@@ -548,7 +551,7 @@ config SUNBMAC
 
 config SUNQE
         tristate "Sun QuadEthernet support"
-        depends on NET_ETHERNET && SBUS
+        depends on SBUS
         select CRC32
         help
           This driver supports the "qe" 10baseT Ethernet device, available as
@@ -560,7 +563,7 @@ config SUNQE
 
 config SUNGEM
         tristate "Sun GEM support"
-        depends on NET_ETHERNET && PCI
+        depends on PCI
         select CRC32
         help
           Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
@@ -568,7 +571,7 @@ config SUNGEM
 
 config CASSINI
         tristate "Sun Cassini support"
-        depends on NET_ETHERNET && PCI
+        depends on PCI
         select CRC32
         help
           Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
@@ -576,7 +579,7 @@ config CASSINI
 
 config NET_VENDOR_3COM
         bool "3COM cards"
-        depends on NET_ETHERNET && (ISA || EISA || MCA || PCI)
+        depends on ISA || EISA || MCA || PCI
         help
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
@@ -736,7 +739,7 @@ config TYPHOON
 
 config LANCE
         tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-        depends on NET_ETHERNET && ISA && ISA_DMA_API
+        depends on ISA && ISA_DMA_API
         help
           If you have a network (Ethernet) card of this type, say Y and read
           the Ethernet-HOWTO, available from
@@ -748,7 +751,7 @@ config LANCE
 
 config NET_VENDOR_SMC
         bool "Western Digital/SMC cards"
-        depends on NET_ETHERNET && (ISA || MCA || EISA || MAC)
+        depends on ISA || MCA || EISA || MAC
         help
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
@@ -818,11 +821,27 @@ config ULTRA32
           <file:Documentation/networking/net-modules.txt>. The module
           will be called smc-ultra32.
 
+config SMC9194
+        tristate "SMC 9194 support"
+        depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
+        select CRC32
+        ---help---
+          This is support for the SMC9xxx based Ethernet cards. Choose this
+          option if you have a DELL laptop with the docking station, or
+          another SMC9192/9194 based chipset.  Say Y if you want it compiled
+          into the kernel, and read the file
+          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>.
+
+          To compile this driver as a module, choose M here and read
+          <file:Documentation/networking/net-modules.txt>. The module
+          will be called smc9194.
+
 config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN)
+        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
           including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -836,26 +855,10 @@ config SMC91X
           module, say M here and read <file:Documentation/kbuild/modules.txt>
           as well as <file:Documentation/networking/net-modules.txt>.
 
-config SMC9194
-        tristate "SMC 9194 support"
-        depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
-        select CRC32
-        ---help---
-          This is support for the SMC9xxx based Ethernet cards. Choose this
-          option if you have a DELL laptop with the docking station, or
-          another SMC9192/9194 based chipset.  Say Y if you want it compiled
-          into the kernel, and read the file
-          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/networking/net-modules.txt>. The module
-          will be called smc9194.
-
 config NET_NETX
         tristate "NetX Ethernet support"
         select MII
-        depends on NET_ETHERNET && ARCH_NETX
+        depends on ARCH_NETX
         help
           This is support for the Hilscher netX builtin Ethernet ports
 
@@ -865,7 +868,7 @@ config NET_NETX
 
 config DM9000
         tristate "DM9000 support"
-        depends on (ARM || MIPS) && NET_ETHERNET
+        depends on ARM || MIPS
         select CRC32
         select MII
         ---help---
@@ -879,7 +882,7 @@ config SMC911X
         tristate "SMSC LAN911[5678] support"
         select CRC32
         select MII
-        depends on NET_ETHERNET && ARCH_PXA
+        depends on ARCH_PXA
         help
           This is a driver for SMSC's LAN911x series of Ethernet chipsets
           including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@ -893,7 +896,7 @@ config SMC911X
 
 config NET_VENDOR_RACAL
         bool "Racal-Interlan (Micom) NI cards"
-        depends on NET_ETHERNET && ISA
+        depends on ISA
         help
           If you have a network (Ethernet) card belonging to this class, such
           as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
@@ -945,7 +948,7 @@ source "drivers/net/tulip/Kconfig"
 
 config AT1700
         tristate "AT1700/1720 support (EXPERIMENTAL)"
-        depends on NET_ETHERNET && (ISA || MCA_LEGACY) && EXPERIMENTAL
+        depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
         select CRC32
         ---help---
           If you have a network (Ethernet) card of this type, say Y and read
@@ -958,7 +961,7 @@ config AT1700
 
 config DEPCA
         tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
-        depends on NET_ETHERNET && (ISA || EISA || MCA)
+        depends on ISA || EISA || MCA
         select CRC32
         ---help---
           If you have a network (Ethernet) card of this type, say Y and read
@@ -972,7 +975,7 @@ config DEPCA
 
 config HP100
         tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
-        depends on NET_ETHERNET && (ISA || EISA || PCI)
+        depends on ISA || EISA || PCI
         help
           If you have a network (Ethernet) card of this type, say Y and read
           the Ethernet-HOWTO, available from
@@ -984,7 +987,7 @@ config HP100
 
 config NET_ISA
         bool "Other ISA cards"
-        depends on NET_ETHERNET && ISA
+        depends on ISA
         ---help---
           If your network (Ethernet) card hasn't been mentioned yet and its
           bus system (that's the way the cards talks to the other components
@@ -1147,7 +1150,7 @@ config SEEQ8005
 
 config NE2_MCA
         tristate "NE/2 (ne2000 MCA version) support"
-        depends on NET_ETHERNET && MCA_LEGACY
+        depends on MCA_LEGACY
         select CRC32
         help
           If you have a network (Ethernet) card of this type, say Y and read
@@ -1160,7 +1163,7 @@ config NE2_MCA
 
 config IBMLANA
         tristate "IBM LAN Adapter/A support"
-        depends on NET_ETHERNET && MCA && MCA_LEGACY
+        depends on MCA && MCA_LEGACY
         ---help---
           This is a Micro Channel Ethernet adapter.  You need to set
           CONFIG_MCA to use this driver.  It is both available as an in-kernel
@@ -1176,7 +1179,7 @@ config IBMLANA
 
 config IBMVETH
         tristate "IBM LAN Virtual Ethernet support"
-        depends on NET_ETHERNET && PPC_PSERIES
+        depends on PPC_PSERIES
         ---help---
           This driver supports virtual ethernet adapters on newer IBM iSeries
           and pSeries systems.
@@ -1257,7 +1260,7 @@ config IBM_EMAC_TAH
 
 config NET_PCI
         bool "EISA, VLB, PCI and on board controllers"
-        depends on NET_ETHERNET && (ISA || EISA || PCI)
+        depends on ISA || EISA || PCI
         help
           This is another class of network cards which attach directly to the
           bus. If you have one of those, say Y and read the Ethernet-HOWTO,
@@ -1313,6 +1316,7 @@ config AMD8111_ETH
           To compile this driver as a module, choose M here and read
           <file:Documentation/networking/net-modules.txt>. The module
           will be called amd8111e.
+
 config AMD8111E_NAPI
         bool "Enable NAPI support"
         depends on AMD8111_ETH
@@ -1778,7 +1782,7 @@ config SC92031
 
 config NET_POCKET
         bool "Pocket and portable adapters"
-        depends on NET_ETHERNET && PARPORT
+        depends on PARPORT
         ---help---
           Cute little network (Ethernet) devices which attach to the parallel
           port ("pocket adapters"), commonly used with laptops. If you have
@@ -1847,14 +1851,14 @@ config DE620
 
 config SGISEEQ
         tristate "SGI Seeq ethernet controller support"
-        depends on NET_ETHERNET && SGI_IP22
+        depends on SGI_IP22
         help
           Say Y here if you have an Seeq based Ethernet network card. This is
           used in many Silicon Graphics machines.
 
 config DECLANCE
         tristate "DEC LANCE ethernet controller support"
-        depends on NET_ETHERNET && MACH_DECSTATION
+        depends on MACH_DECSTATION
         select CRC32
         help
           This driver is for the series of Ethernet controllers produced by
@@ -1884,7 +1888,7 @@ config FEC2
 
 config NE_H8300
         tristate "NE2000 compatible support for H8/300"
-        depends on H8300 && NET_ETHERNET
+        depends on H8300
         help
           Say Y here if you want to use the NE2000 compatible
           controller on the Renesas H8/300 processor.
@@ -1892,7 +1896,7 @@ config NE_H8300
 source "drivers/net/fec_8xx/Kconfig"
 source "drivers/net/fs_enet/Kconfig"
 
-endmenu
+endif # NET_ETHERNET
 
 #
 #       Gigabit Ethernet
@@ -2948,8 +2952,6 @@ config NETCONSOLE
         If you want to log kernel messages over the network, enable this.
         See <file:Documentation/networking/netconsole.txt> for details.
 
-endif #NETDEVICES
-
 config NETPOLL
         def_bool NETCONSOLE
 
@@ -2961,4 +2963,4 @@ config NETPOLL_TRAP
 config NET_POLL_CONTROLLER
         def_bool NETPOLL
 
-endmenu
+endif # NETDEVICES
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a77affa4f6e6..eb62fb48e4b7 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -157,6 +157,7 @@ obj-$(CONFIG_ELPLUS) += 3c505.o
 obj-$(CONFIG_AC3200) += ac3200.o 8390.o
 obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
+obj-$(CONFIG_SNI_82596) += sni_82596.o
 obj-$(CONFIG_MVME16x_NET) += 82596.o
 obj-$(CONFIG_BVME6000_NET) += 82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 04382f979c99..b78a4e5ceeb2 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -159,10 +159,6 @@ static struct pci_device_id acenic_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, acenic_pci_tbl);
 
-#ifndef SET_NETDEV_DEV
-#define SET_NETDEV_DEV(net, pdev)       do{} while(0)
-#endif
-
 #define ace_sync_irq(irq)       synchronize_irq(irq)
 
 #ifndef offset_in_page
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 678e4f48d36b..5bf2d33887ac 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -4,7 +4,7 @@
 #
 config ARM_AM79C961A
         bool "ARM EBSA110 AM79C961A support"
-        depends on NET_ETHERNET && ARM && ARCH_EBSA110
+        depends on ARM && ARCH_EBSA110
         select CRC32
         help
           If you wish to compile a kernel for the EBSA-110, then you should
@@ -12,21 +12,21 @@ config ARM_AM79C961A
 
 config ARM_ETHER1
         tristate "Acorn Ether1 support"
-        depends on NET_ETHERNET && ARM && ARCH_ACORN
+        depends on ARM && ARCH_ACORN
         help
           If you have an Acorn system with one of these (AKA25) network cards,
           you should say Y to this option if you wish to use it with Linux.
 
 config ARM_ETHER3
         tristate "Acorn/ANT Ether3 support"
-        depends on NET_ETHERNET && ARM && ARCH_ACORN
+        depends on ARM && ARCH_ACORN
         help
           If you have an Acorn system with one of these network cards, you
           should say Y to this option if you wish to use it with Linux.
 
 config ARM_ETHERH
         tristate "I-cubed EtherH/ANT EtherM support"
-        depends on NET_ETHERNET && ARM && ARCH_ACORN
+        depends on ARM && ARCH_ACORN
         select CRC32
         help
           If you have an Acorn system with one of these network cards, you
@@ -34,7 +34,7 @@ config ARM_ETHERH
 
 config ARM_AT91_ETHER
         tristate "AT91RM9200 Ethernet support"
-        depends on NET_ETHERNET && ARM && ARCH_AT91RM9200
+        depends on ARM && ARCH_AT91RM9200
         select MII
         help
           If you wish to compile a kernel for the AT91RM9200 and enable
@@ -42,7 +42,7 @@ config ARM_AT91_ETHER
 
 config EP93XX_ETH
         tristate "EP93xx Ethernet support"
-        depends on NET_ETHERNET && ARM && ARCH_EP93XX
+        depends on ARM && ARCH_EP93XX
         help
           This is a driver for the ethernet hardware included in EP93xx CPUs.
           Say Y if you are building a kernel for EP93xx based devices.
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 879a2fff474e..96fb0ec905a7 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -15,6 +15,7 @@
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/if_ether.h>
+#include <linux/if_vlan.h>
 #include <linux/etherdevice.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
@@ -68,8 +69,8 @@
           (BP)->tx_cons - (BP)->tx_prod - TX_RING_GAP(BP))
 #define NEXT_TX(N)              (((N) + 1) & (B44_TX_RING_SIZE - 1))
 
-#define RX_PKT_BUF_SZ           (1536 + bp->rx_offset + 64)
-#define TX_PKT_BUF_SZ           (B44_MAX_MTU + ETH_HLEN + 8)
+#define RX_PKT_OFFSET           30
+#define RX_PKT_BUF_SZ           (1536 + RX_PKT_OFFSET + 64)
 
 /* minimum number of free TX descriptors required to wake up TX process */
 #define B44_TX_WAKEUP_THRESH            (B44_TX_RING_SIZE / 4)
@@ -599,8 +600,7 @@ static void b44_timer(unsigned long __opaque)
 
         spin_unlock_irq(&bp->lock);
 
-        bp->timer.expires = jiffies + HZ;
-        add_timer(&bp->timer);
+        mod_timer(&bp->timer, round_jiffies(jiffies + HZ));
 }
 
 static void b44_tx(struct b44 *bp)
@@ -653,7 +653,7 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
                 src_map = &bp->rx_buffers[src_idx];
         dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1);
         map = &bp->rx_buffers[dest_idx];
-        skb = dev_alloc_skb(RX_PKT_BUF_SZ);
+        skb = netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ);
         if (skb == NULL)
                 return -ENOMEM;
 
@@ -669,7 +669,7 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
                 if (!dma_mapping_error(mapping))
                         pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
                 dev_kfree_skb_any(skb);
-                skb = __dev_alloc_skb(RX_PKT_BUF_SZ,GFP_DMA);
+                skb = __netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ, GFP_ATOMIC|GFP_DMA);
                 if (skb == NULL)
                         return -ENOMEM;
                 mapping = pci_map_single(bp->pdev, skb->data,
@@ -684,11 +684,9 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
                 }
         }
 
-        skb->dev = bp->dev;
-        skb_reserve(skb, bp->rx_offset);
+        rh = (struct rx_header *) skb->data;
+        skb_reserve(skb, RX_PKT_OFFSET);
 
-        rh = (struct rx_header *)
-                (skb->data - bp->rx_offset);
         rh->len = 0;
         rh->flags = 0;
 
@@ -698,13 +696,13 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
         if (src_map != NULL)
                 src_map->skb = NULL;
 
-        ctrl  = (DESC_CTRL_LEN & (RX_PKT_BUF_SZ - bp->rx_offset));
+        ctrl  = (DESC_CTRL_LEN & (RX_PKT_BUF_SZ - RX_PKT_OFFSET));
         if (dest_idx == (B44_RX_RING_SIZE - 1))
                 ctrl |= DESC_CTRL_EOT;
 
         dp = &bp->rx_ring[dest_idx];
         dp->ctrl = cpu_to_le32(ctrl);
-        dp->addr = cpu_to_le32((u32) mapping + bp->rx_offset + bp->dma_offset);
+        dp->addr = cpu_to_le32((u32) mapping + RX_PKT_OFFSET + bp->dma_offset);
 
         if (bp->flags & B44_FLAG_RX_RING_HACK)
                 b44_sync_dma_desc_for_device(bp->pdev, bp->rx_ring_dma,
@@ -783,7 +781,7 @@ static int b44_rx(struct b44 *bp, int budget)
                                             PCI_DMA_FROMDEVICE);
                 rh = (struct rx_header *) skb->data;
                 len = le16_to_cpu(rh->len);
-                if ((len > (RX_PKT_BUF_SZ - bp->rx_offset)) ||
+                if ((len > (RX_PKT_BUF_SZ - RX_PKT_OFFSET)) ||
                     (rh->flags & cpu_to_le16(RX_FLAG_ERRORS))) {
                 drop_it:
                         b44_recycle_rx(bp, cons, bp->rx_prod);
@@ -815,8 +813,8 @@ static int b44_rx(struct b44 *bp, int budget)
                         pci_unmap_single(bp->pdev, map,
                                          skb_size, PCI_DMA_FROMDEVICE);
                         /* Leave out rx_header */
-                        skb_put(skb, len+bp->rx_offset);
-                        skb_pull(skb,bp->rx_offset);
+                        skb_put(skb, len + RX_PKT_OFFSET);
+                        skb_pull(skb, RX_PKT_OFFSET);
                 } else {
                         struct sk_buff *copy_skb;
 
@@ -828,7 +826,7 @@ static int b44_rx(struct b44 *bp, int budget)
                         skb_reserve(copy_skb, 2);
                         skb_put(copy_skb, len);
                         /* DMA sync done above, copy just the actual packet */
-                        skb_copy_from_linear_data_offset(skb, bp->rx_offset,
+                        skb_copy_from_linear_data_offset(skb, RX_PKT_OFFSET,
                                                          copy_skb->data, len);
                         skb = copy_skb;
                 }
@@ -969,7 +967,6 @@ static void b44_tx_timeout(struct net_device *dev)
 static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct b44 *bp = netdev_priv(dev);
-        struct sk_buff *bounce_skb;
         int rc = NETDEV_TX_OK;
         dma_addr_t mapping;
         u32 len, entry, ctrl;
@@ -987,12 +984,13 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
         if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
+                struct sk_buff *bounce_skb;
+
                 /* Chip can't handle DMA to/from >1GB, use bounce buffer */
                 if (!dma_mapping_error(mapping))
                         pci_unmap_single(bp->pdev, mapping, len, PCI_DMA_TODEVICE);
 
-                bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ,
-                                             GFP_ATOMIC|GFP_DMA);
+                bounce_skb = __dev_alloc_skb(len, GFP_ATOMIC | GFP_DMA);
                 if (!bounce_skb)
                         goto err_out;
 
@@ -1001,13 +999,12 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
                         if (!dma_mapping_error(mapping))
                                 pci_unmap_single(bp->pdev, mapping,
-                                         len, PCI_DMA_TODEVICE);
+                                                 len, PCI_DMA_TODEVICE);
                         dev_kfree_skb_any(bounce_skb);
                         goto err_out;
                 }
 
-                skb_copy_from_linear_data(skb, skb_put(bounce_skb, len),
-                                          skb->len);
+                skb_copy_from_linear_data(skb, skb_put(bounce_skb, len), len);
                 dev_kfree_skb_any(skb);
                 skb = bounce_skb;
         }
@@ -1396,12 +1393,12 @@ static void b44_init_hw(struct b44 *bp, int reset_kind)
         bw32(bp, B44_TX_WMARK, 56); /* XXX magic */
         if (reset_kind == B44_PARTIAL_RESET) {
                 bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
-                                      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+                                      (RX_PKT_OFFSET << DMARX_CTRL_ROSHIFT)));
         } else {
                 bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
                 bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
                 bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
-                                      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+                                      (RX_PKT_OFFSET << DMARX_CTRL_ROSHIFT)));
                 bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
 
                 bw32(bp, B44_DMARX_PTR, bp->rx_pending);
@@ -2093,11 +2090,6 @@ static int __devinit b44_get_invariants(struct b44 *bp)
 
         bp->phy_addr = eeprom[90] & 0x1f;
 
-        /* With this, plus the rx_header prepended to the data by the
-         * hardware, we'll land the ethernet header on a 2-byte boundary.
-         */
-        bp->rx_offset = 30;
-
         bp->imask = IMASK_DEF;
 
         bp->core_unit = ssb_core_unit(bp);
@@ -2348,11 +2340,11 @@ static int b44_resume(struct pci_dev *pdev)
         netif_device_attach(bp->dev);
         spin_unlock_irq(&bp->lock);
 
-        bp->timer.expires = jiffies + HZ;
-        add_timer(&bp->timer);
-
         b44_enable_ints(bp);
         netif_wake_queue(dev);
+
+        mod_timer(&bp->timer, jiffies + 1);
+
         return 0;
 }
 
diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index 18fc13336628..e537e63f292e 100644
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -443,8 +443,6 @@ struct b44 {
 #define B44_FLAG_TX_RING_HACK   0x40000000
 #define B44_FLAG_WOL_ENABLE     0x80000000
 
-        u32                     rx_offset;
-
         u32                     msg_enable;
 
         struct timer_list       timer;
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 80c3d8f268a7..ab72563b81ee 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -71,27 +71,29 @@ enum {				/* adapter flags */
         QUEUES_BOUND = (1 << 3),
 };
 
+struct fl_pg_chunk {
+        struct page *page;
+        void *va;
+        unsigned int offset;
+};
+
 struct rx_desc;
 struct rx_sw_desc;
 
-struct sge_fl_page {
-        struct skb_frag_struct frag;
-        unsigned char *va;
-};
-
-struct sge_fl {                 /* SGE per free-buffer list state */
-        unsigned int buf_size;  /* size of each Rx buffer */
-        unsigned int credits;   /* # of available Rx buffers */
-        unsigned int size;      /* capacity of free list */
-        unsigned int cidx;      /* consumer index */
-        unsigned int pidx;      /* producer index */
-        unsigned int gen;       /* free list generation */
-        unsigned int cntxt_id;  /* SGE context id for the free list */
-        struct sge_fl_page page;
-        struct rx_desc *desc;   /* address of HW Rx descriptor ring */
-        struct rx_sw_desc *sdesc;       /* address of SW Rx descriptor ring */
-        dma_addr_t phys_addr;   /* physical address of HW ring start */
-        unsigned long empty;    /* # of times queue ran out of buffers */
+struct sge_fl {                     /* SGE per free-buffer list state */
+        unsigned int buf_size;      /* size of each Rx buffer */
+        unsigned int credits;       /* # of available Rx buffers */
+        unsigned int size;          /* capacity of free list */
+        unsigned int cidx;          /* consumer index */
+        unsigned int pidx;          /* producer index */
+        unsigned int gen;           /* free list generation */
+        struct fl_pg_chunk pg_chunk;/* page chunk cache */
+        unsigned int use_pages;     /* whether FL uses pages or sk_buffs */
+        struct rx_desc *desc;       /* address of HW Rx descriptor ring */
+        struct rx_sw_desc *sdesc;   /* address of SW Rx descriptor ring */
+        dma_addr_t   phys_addr;     /* physical address of HW ring start */
+        unsigned int cntxt_id;      /* SGE context id for the free list */
+        unsigned long empty;        /* # of times queue ran out of buffers */
         unsigned long alloc_failed; /* # of times buffer allocation failed */
 };
 
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 8d1379633698..16378004507a 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -101,6 +101,7 @@ enum {
         TCB_SIZE = 128,         /* TCB size */
         NMTUS = 16,             /* size of MTU table */
         NCCTRL_WIN = 32,        /* # of congestion control windows */
+        PROTO_SRAM_LINES = 128, /* size of TP sram */
 };
 
 #define MAX_RX_COALESCING_LEN 16224U
@@ -124,6 +125,30 @@ enum {				/* adapter interrupt-maintained statistics */
 };
 
 enum {
+        TP_VERSION_MAJOR        = 1,
+        TP_VERSION_MINOR        = 0,
+        TP_VERSION_MICRO        = 44
+};
+
+#define S_TP_VERSION_MAJOR              16
+#define M_TP_VERSION_MAJOR              0xFF
+#define V_TP_VERSION_MAJOR(x)           ((x) << S_TP_VERSION_MAJOR)
+#define G_TP_VERSION_MAJOR(x)           \
+            (((x) >> S_TP_VERSION_MAJOR) & M_TP_VERSION_MAJOR)
+
+#define S_TP_VERSION_MINOR              8
+#define M_TP_VERSION_MINOR              0xFF
+#define V_TP_VERSION_MINOR(x)           ((x) << S_TP_VERSION_MINOR)
+#define G_TP_VERSION_MINOR(x)           \
+            (((x) >> S_TP_VERSION_MINOR) & M_TP_VERSION_MINOR)
+
+#define S_TP_VERSION_MICRO              0
+#define M_TP_VERSION_MICRO              0xFF
+#define V_TP_VERSION_MICRO(x)           ((x) << S_TP_VERSION_MICRO)
+#define G_TP_VERSION_MICRO(x)           \
+            (((x) >> S_TP_VERSION_MICRO) & M_TP_VERSION_MICRO)
+
+enum {
         SGE_QSETS = 8,          /* # of SGE Tx/Rx/RspQ sets */
         SGE_RXQ_PER_SET = 2,    /* # of Rx queues per set */
         SGE_TXQ_PER_SET = 3     /* # of Tx queues per set */
@@ -654,6 +679,9 @@ const struct adapter_info *t3_get_adapter_info(unsigned int board_id);
 int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data);
 int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data);
 int t3_seeprom_wp(struct adapter *adapter, int enable);
+int t3_check_tpsram_version(struct adapter *adapter);
+int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size);
+int t3_set_proto_sram(struct adapter *adap, u8 *data);
 int t3_read_flash(struct adapter *adapter, unsigned int addr,
                   unsigned int nwords, u32 *data, int byte_oriented);
 int t3_load_fw(struct adapter *adapter, const u8 * fw_data, unsigned int size);
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index d8a1f5452c51..15defe4c4f05 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2088,6 +2088,42 @@ static void cxgb_netpoll(struct net_device *dev)
 }
 #endif
 
+#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
+int update_tpsram(struct adapter *adap)
+{
+        const struct firmware *tpsram;
+        char buf[64];
+        struct device *dev = &adap->pdev->dev;
+        int ret;
+        char rev;
+        
+        rev = adap->params.rev == T3_REV_B2 ? 'b' : 'a';
+
+        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
+                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+
+        ret = request_firmware(&tpsram, buf, dev);
+        if (ret < 0) {
+                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
+                        buf);
+                return ret;
+        }
+        
+        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
+        if (ret)
+                goto release_tpsram;    
+
+        ret = t3_set_proto_sram(adap, tpsram->data);
+        if (ret)
+                dev_err(dev, "loading protocol SRAM failed\n");
+
+release_tpsram:
+        release_firmware(tpsram);
+        
+        return ret;
+}
+
+
 /*
  * Periodic accumulation of MAC statistics.
  */
@@ -2437,6 +2473,13 @@ static int __devinit init_one(struct pci_dev *pdev,
                 goto out_free_dev;
         }
 
+        err = t3_check_tpsram_version(adapter);
+        if (err == -EINVAL)
+                err = update_tpsram(adapter);
+
+        if (err)
+                goto out_free_dev;
+                
         /*
          * The card is now ready to go.  If any errors occur during device
          * registration we do not fail the whole card but rather proceed only
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/cxgb3/regs.h
index 020859c855d7..aa80313c922e 100644
--- a/drivers/net/cxgb3/regs.h
+++ b/drivers/net/cxgb3/regs.h
@@ -1160,6 +1160,8 @@
 
 #define A_TP_MOD_CHANNEL_WEIGHT 0x434
 
+#define A_TP_MOD_RATE_LIMIT 0x438
+
 #define A_TP_PIO_ADDR 0x440
 
 #define A_TP_PIO_DATA 0x444
@@ -1214,6 +1216,15 @@
 #define G_TXDROPCNTCH0RCVD(x) (((x) >> S_TXDROPCNTCH0RCVD) & \
                                M_TXDROPCNTCH0RCVD)
 
+#define A_TP_PROXY_FLOW_CNTL 0x4b0
+
+#define A_TP_EMBED_OP_FIELD0 0x4e8
+#define A_TP_EMBED_OP_FIELD1 0x4ec
+#define A_TP_EMBED_OP_FIELD2 0x4f0
+#define A_TP_EMBED_OP_FIELD3 0x4f4
+#define A_TP_EMBED_OP_FIELD4 0x4f8
+#define A_TP_EMBED_OP_FIELD5 0x4fc
+
 #define A_ULPRX_CTL 0x500
 
 #define S_ROUND_ROBIN    4
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index a60ec4d4707c..a2cfd68ac757 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -46,23 +46,16 @@
 
 #define SGE_RX_SM_BUF_SIZE 1536
 
-/*
- * If USE_RX_PAGE is defined, the small freelist populated with (partial)
- * pages instead of skbs. Pages are carved up into RX_PAGE_SIZE chunks (must
- * be a multiple of the host page size).
- */
-#define USE_RX_PAGE
-#define RX_PAGE_SIZE 2048
-
-/*
- * skb freelist packets are copied into a new skb (and the freelist one is 
- * reused) if their len is <= 
- */
 #define SGE_RX_COPY_THRES  256
+#define SGE_RX_PULL_LEN    128
 
 /*
- * Minimum number of freelist entries before we start dropping TUNNEL frames.
+ * Page chunk size for FL0 buffers if FL0 is to be populated with page chunks.
+ * It must be a divisor of PAGE_SIZE.  If set to 0 FL0 will use sk_buffs
+ * directly.
  */
+#define FL0_PG_CHUNK_SIZE  2048
+
 #define SGE_RX_DROP_THRES 16
 
 /*
@@ -100,12 +93,12 @@ struct tx_sw_desc {		/* SW state per Tx descriptor */
         struct sk_buff *skb;
 };
 
-struct rx_sw_desc {             /* SW state per Rx descriptor */
+struct rx_sw_desc {                /* SW state per Rx descriptor */
         union {
                 struct sk_buff *skb;
-                struct sge_fl_page page;
-        } t;
-         DECLARE_PCI_UNMAP_ADDR(dma_addr);
+                struct fl_pg_chunk pg_chunk;
+        };
+        DECLARE_PCI_UNMAP_ADDR(dma_addr);
 };
 
 struct rsp_desc {               /* response queue descriptor */
@@ -351,27 +344,26 @@ static void free_rx_bufs(struct pci_dev *pdev, struct sge_fl *q)
 
                 pci_unmap_single(pdev, pci_unmap_addr(d, dma_addr),
                                  q->buf_size, PCI_DMA_FROMDEVICE);
-
-                if (q->buf_size != RX_PAGE_SIZE) {
-                        kfree_skb(d->t.skb);
-                        d->t.skb = NULL;
+                if (q->use_pages) {
+                        put_page(d->pg_chunk.page);
+                        d->pg_chunk.page = NULL;
                 } else {
-                        if (d->t.page.frag.page)
-                                put_page(d->t.page.frag.page);
-                        d->t.page.frag.page = NULL;
+                        kfree_skb(d->skb);
+                        d->skb = NULL;
                 }
                 if (++cidx == q->size)
                         cidx = 0;
         }
 
-        if (q->page.frag.page)
-                put_page(q->page.frag.page);
-        q->page.frag.page = NULL;
+        if (q->pg_chunk.page) {
+                __free_page(q->pg_chunk.page);
+                q->pg_chunk.page = NULL;
+        }
 }
 
 /**
  *      add_one_rx_buf - add a packet buffer to a free-buffer list
- *      @va: va of the buffer to add
+ *      @va:  buffer start VA
  *      @len: the buffer length
  *      @d: the HW Rx descriptor to write
  *      @sd: the SW Rx descriptor to write
@@ -381,7 +373,7 @@ static void free_rx_bufs(struct pci_dev *pdev, struct sge_fl *q)
  *      Add a buffer of the given length to the supplied HW and SW Rx
  *      descriptors.
  */
-static inline void add_one_rx_buf(unsigned char *va, unsigned int len,
+static inline void add_one_rx_buf(void *va, unsigned int len,
                                   struct rx_desc *d, struct rx_sw_desc *sd,
                                   unsigned int gen, struct pci_dev *pdev)
 {
@@ -397,6 +389,27 @@ static inline void add_one_rx_buf(unsigned char *va, unsigned int len,
         d->gen2 = cpu_to_be32(V_FLD_GEN2(gen));
 }
 
+static int alloc_pg_chunk(struct sge_fl *q, struct rx_sw_desc *sd, gfp_t gfp)
+{
+        if (!q->pg_chunk.page) {
+                q->pg_chunk.page = alloc_page(gfp);
+                if (unlikely(!q->pg_chunk.page))
+                        return -ENOMEM;
+                q->pg_chunk.va = page_address(q->pg_chunk.page);
+                q->pg_chunk.offset = 0;
+        }
+        sd->pg_chunk = q->pg_chunk;
+
+        q->pg_chunk.offset += q->buf_size;
+        if (q->pg_chunk.offset == PAGE_SIZE)
+                q->pg_chunk.page = NULL;
+        else {
+                q->pg_chunk.va += q->buf_size;
+                get_page(q->pg_chunk.page);
+        }
+        return 0;
+}
+
 /**
  *      refill_fl - refill an SGE free-buffer list
  *      @adapter: the adapter
@@ -410,49 +423,29 @@ static inline void add_one_rx_buf(unsigned char *va, unsigned int len,
  */
 static void refill_fl(struct adapter *adap, struct sge_fl *q, int n, gfp_t gfp)
 {
+        void *buf_start;
         struct rx_sw_desc *sd = &q->sdesc[q->pidx];
         struct rx_desc *d = &q->desc[q->pidx];
-        struct sge_fl_page *p = &q->page;
 
         while (n--) {
-                unsigned char *va;
-
-                if (unlikely(q->buf_size != RX_PAGE_SIZE)) {
-                        struct sk_buff *skb = alloc_skb(q->buf_size, gfp);
-
-                        if (!skb) {
-                                q->alloc_failed++;
+                if (q->use_pages) {
+                        if (unlikely(alloc_pg_chunk(q, sd, gfp))) {
+nomem:                          q->alloc_failed++;
                                 break;
                         }
-                        va = skb->data;
-                        sd->t.skb = skb;
+                        buf_start = sd->pg_chunk.va;
                 } else {
-                        if (!p->frag.page) {
-                                p->frag.page = alloc_pages(gfp, 0);
-                                if (unlikely(!p->frag.page)) {
-                                        q->alloc_failed++;
-                                        break;
-                                } else {
-                                        p->frag.size = RX_PAGE_SIZE;
-                                        p->frag.page_offset = 0;
-                                        p->va = page_address(p->frag.page);
-                                }
-                        }
+                        struct sk_buff *skb = alloc_skb(q->buf_size, gfp);
 
-                        memcpy(&sd->t, p, sizeof(*p));
-                        va = p->va;
+                        if (!skb)
+                                goto nomem;
 
-                        p->frag.page_offset += RX_PAGE_SIZE;
-                        BUG_ON(p->frag.page_offset > PAGE_SIZE);
-                        p->va += RX_PAGE_SIZE;
-                        if (p->frag.page_offset == PAGE_SIZE)
-                                p->frag.page = NULL;
-                        else
-                                get_page(p->frag.page);
+                        sd->skb = skb;
+                        buf_start = skb->data;
                 }
 
-                add_one_rx_buf(va, q->buf_size, d, sd, q->gen, adap->pdev);
-
+                add_one_rx_buf(buf_start, q->buf_size, d, sd, q->gen,
+                               adap->pdev);
                 d++;
                 sd++;
                 if (++q->pidx == q->size) {
@@ -487,7 +480,7 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,
         struct rx_desc *from = &q->desc[idx];
         struct rx_desc *to = &q->desc[q->pidx];
 
-        memcpy(&q->sdesc[q->pidx], &q->sdesc[idx], sizeof(struct rx_sw_desc));
+        q->sdesc[q->pidx] = q->sdesc[idx];
         to->addr_lo = from->addr_lo;    /* already big endian */
         to->addr_hi = from->addr_hi;    /* likewise */
         wmb();
@@ -650,6 +643,132 @@ static inline unsigned int flits_to_desc(unsigned int n)
 }
 
 /**
+ *      get_packet - return the next ingress packet buffer from a free list
+ *      @adap: the adapter that received the packet
+ *      @fl: the SGE free list holding the packet
+ *      @len: the packet length including any SGE padding
+ *      @drop_thres: # of remaining buffers before we start dropping packets
+ *
+ *      Get the next packet from a free list and complete setup of the
+ *      sk_buff.  If the packet is small we make a copy and recycle the
+ *      original buffer, otherwise we use the original buffer itself.  If a
+ *      positive drop threshold is supplied packets are dropped and their
+ *      buffers recycled if (a) the number of remaining buffers is under the
+ *      threshold and the packet is too big to copy, or (b) the packet should
+ *      be copied but there is no memory for the copy.
+ */
+static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,
+                                  unsigned int len, unsigned int drop_thres)
+{
+        struct sk_buff *skb = NULL;
+        struct rx_sw_desc *sd = &fl->sdesc[fl->cidx];
+
+        prefetch(sd->skb->data);
+        fl->credits--;
+
+        if (len <= SGE_RX_COPY_THRES) {
+                skb = alloc_skb(len, GFP_ATOMIC);
+                if (likely(skb != NULL)) {
+                        __skb_put(skb, len);
+                        pci_dma_sync_single_for_cpu(adap->pdev,
+                                            pci_unmap_addr(sd, dma_addr), len,
+                                            PCI_DMA_FROMDEVICE);
+                        memcpy(skb->data, sd->skb->data, len);
+                        pci_dma_sync_single_for_device(adap->pdev,
+                                            pci_unmap_addr(sd, dma_addr), len,
+                                            PCI_DMA_FROMDEVICE);
+                } else if (!drop_thres)
+                        goto use_orig_buf;
+recycle:
+                recycle_rx_buf(adap, fl, fl->cidx);
+                return skb;
+        }
+
+        if (unlikely(fl->credits < drop_thres))
+                goto recycle;
+
+use_orig_buf:
+        pci_unmap_single(adap->pdev, pci_unmap_addr(sd, dma_addr),
+                         fl->buf_size, PCI_DMA_FROMDEVICE);
+        skb = sd->skb;
+        skb_put(skb, len);
+        __refill_fl(adap, fl);
+        return skb;
+}
+
+/**
+ *      get_packet_pg - return the next ingress packet buffer from a free list
+ *      @adap: the adapter that received the packet
+ *      @fl: the SGE free list holding the packet
+ *      @len: the packet length including any SGE padding
+ *      @drop_thres: # of remaining buffers before we start dropping packets
+ *
+ *      Get the next packet from a free list populated with page chunks.
+ *      If the packet is small we make a copy and recycle the original buffer,
+ *      otherwise we attach the original buffer as a page fragment to a fresh
+ *      sk_buff.  If a positive drop threshold is supplied packets are dropped
+ *      and their buffers recycled if (a) the number of remaining buffers is
+ *      under the threshold and the packet is too big to copy, or (b) there's
+ *      no system memory.
+ *
+ *      Note: this function is similar to @get_packet but deals with Rx buffers
+ *      that are page chunks rather than sk_buffs.
+ */
+static struct sk_buff *get_packet_pg(struct adapter *adap, struct sge_fl *fl,
+                                     unsigned int len, unsigned int drop_thres)
+{
+        struct sk_buff *skb = NULL;
+        struct rx_sw_desc *sd = &fl->sdesc[fl->cidx];
+
+        if (len <= SGE_RX_COPY_THRES) {
+                skb = alloc_skb(len, GFP_ATOMIC);
+                if (likely(skb != NULL)) {
+                        __skb_put(skb, len);
+                        pci_dma_sync_single_for_cpu(adap->pdev,
+                                            pci_unmap_addr(sd, dma_addr), len,
+                                            PCI_DMA_FROMDEVICE);
+                        memcpy(skb->data, sd->pg_chunk.va, len);
+                        pci_dma_sync_single_for_device(adap->pdev,
+                                            pci_unmap_addr(sd, dma_addr), len,
+                                            PCI_DMA_FROMDEVICE);
+                } else if (!drop_thres)
+                        return NULL;
+recycle:
+                fl->credits--;
+                recycle_rx_buf(adap, fl, fl->cidx);
+                return skb;
+        }
+
+        if (unlikely(fl->credits <= drop_thres))
+                goto recycle;
+
+        skb = alloc_skb(SGE_RX_PULL_LEN, GFP_ATOMIC);
+        if (unlikely(!skb)) {
+                if (!drop_thres)
+                        return NULL;
+                goto recycle;
+        }
+
+        pci_unmap_single(adap->pdev, pci_unmap_addr(sd, dma_addr),
+                         fl->buf_size, PCI_DMA_FROMDEVICE);
+        __skb_put(skb, SGE_RX_PULL_LEN);
+        memcpy(skb->data, sd->pg_chunk.va, SGE_RX_PULL_LEN);
+        skb_fill_page_desc(skb, 0, sd->pg_chunk.page,
+                           sd->pg_chunk.offset + SGE_RX_PULL_LEN,
+                           len - SGE_RX_PULL_LEN);
+        skb->len = len;
+        skb->data_len = len - SGE_RX_PULL_LEN;
+        skb->truesize += skb->data_len;
+
+        fl->credits--;
+        /*
+         * We do not refill FLs here, we let the caller do it to overlap a
+         * prefetch.
+         */
+        return skb;
+}
+
+/**
  *      get_imm_packet - return the next ingress packet buffer from a response
  *      @resp: the response descriptor containing the packet data
  *
@@ -1715,85 +1834,6 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
                 netif_rx(skb);
 }
 
-#define SKB_DATA_SIZE 128
-
-static void skb_data_init(struct sk_buff *skb, struct sge_fl_page *p,
-                          unsigned int len)
-{
-        skb->len = len;
-        if (len <= SKB_DATA_SIZE) {
-                skb_copy_to_linear_data(skb, p->va, len);
-                skb->tail += len;
-                put_page(p->frag.page);
-        } else {
-                skb_copy_to_linear_data(skb, p->va, SKB_DATA_SIZE);
-                skb_shinfo(skb)->frags[0].page = p->frag.page;
-                skb_shinfo(skb)->frags[0].page_offset =
-                    p->frag.page_offset + SKB_DATA_SIZE;
-                skb_shinfo(skb)->frags[0].size = len - SKB_DATA_SIZE;
-                skb_shinfo(skb)->nr_frags = 1;
-                skb->data_len = len - SKB_DATA_SIZE;
-                skb->tail += SKB_DATA_SIZE;
-                skb->truesize += skb->data_len;
-        }
-}
-
-/**
-*      get_packet - return the next ingress packet buffer from a free list
-*      @adap: the adapter that received the packet
-*      @fl: the SGE free list holding the packet
-*      @len: the packet length including any SGE padding
-*      @drop_thres: # of remaining buffers before we start dropping packets
-*
-*      Get the next packet from a free list and complete setup of the
-*      sk_buff.  If the packet is small we make a copy and recycle the
-*      original buffer, otherwise we use the original buffer itself.  If a
-*      positive drop threshold is supplied packets are dropped and their
-*      buffers recycled if (a) the number of remaining buffers is under the
-*      threshold and the packet is too big to copy, or (b) the packet should
-*      be copied but there is no memory for the copy.
-*/
-static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,
-                                  unsigned int len, unsigned int drop_thres)
-{
-        struct sk_buff *skb = NULL;
-        struct rx_sw_desc *sd = &fl->sdesc[fl->cidx];
-
-        prefetch(sd->t.skb->data);
-
-        if (len <= SGE_RX_COPY_THRES) {
-                skb = alloc_skb(len, GFP_ATOMIC);
-                if (likely(skb != NULL)) {
-                        struct rx_desc *d = &fl->desc[fl->cidx];
-                        dma_addr_t mapping =
-                            (dma_addr_t)((u64) be32_to_cpu(d->addr_hi) << 32 |
-                                         be32_to_cpu(d->addr_lo));
-
-                        __skb_put(skb, len);
-                        pci_dma_sync_single_for_cpu(adap->pdev, mapping, len,
-                                                    PCI_DMA_FROMDEVICE);
-                        skb_copy_from_linear_data(sd->t.skb, skb->data, len);
-                        pci_dma_sync_single_for_device(adap->pdev, mapping, len,
-                                                       PCI_DMA_FROMDEVICE);
-                } else if (!drop_thres)
-                        goto use_orig_buf;
-recycle:
-                recycle_rx_buf(adap, fl, fl->cidx);
-                return skb;
-        }
-
-        if (unlikely(fl->credits < drop_thres))
-                goto recycle;
-
-use_orig_buf:
-        pci_unmap_single(adap->pdev, pci_unmap_addr(sd, dma_addr),
-                         fl->buf_size, PCI_DMA_FROMDEVICE);
-        skb = sd->t.skb;
-        skb_put(skb, len);
-        __refill_fl(adap, fl);
-        return skb;
-}
-
 /**
  *      handle_rsp_cntrl_info - handles control information in a response
  *      @qs: the queue set corresponding to the response
@@ -1935,7 +1975,7 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
                 } else if (flags & F_RSPD_IMM_DATA_VALID) {
                         skb = get_imm_packet(r);
                         if (unlikely(!skb)) {
-                              no_mem:
+no_mem:
                                 q->next_holdoff = NOMEM_INTR_DELAY;
                                 q->nomem++;
                                 /* consume one credit since we tried */
@@ -1945,53 +1985,29 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
                         q->imm_data++;
                         ethpad = 0;
                 } else if ((len = ntohl(r->len_cq)) != 0) {
-                        struct sge_fl *fl =
-                            (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
+                        struct sge_fl *fl;
 
-                        if (fl->buf_size == RX_PAGE_SIZE) {
-                                struct rx_sw_desc *sd = &fl->sdesc[fl->cidx];
-                                struct sge_fl_page *p = &sd->t.page;
-
-                                prefetch(p->va);
-                                prefetch(p->va + L1_CACHE_BYTES);
+                        fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
+                        if (fl->use_pages) {
+                                void *addr = fl->sdesc[fl->cidx].pg_chunk.va;
 
+                                prefetch(addr);
+#if L1_CACHE_BYTES < 128
+                                prefetch(addr + L1_CACHE_BYTES);
+#endif
                                 __refill_fl(adap, fl);
 
-                                pci_unmap_single(adap->pdev,
-                                                 pci_unmap_addr(sd, dma_addr),
-                                                 fl->buf_size,
-                                                 PCI_DMA_FROMDEVICE);
-
-                                if (eth) {
-                                        if (unlikely(fl->credits <
-                                                     SGE_RX_DROP_THRES))
-                                                goto eth_recycle;
-
-                                        skb = alloc_skb(SKB_DATA_SIZE,
-                                                        GFP_ATOMIC);
-                                        if (unlikely(!skb)) {
-eth_recycle:
-                                                q->rx_drops++;
-                                                recycle_rx_buf(adap, fl,
-                                                               fl->cidx);
-                                                goto eth_done;
-                                        }
-                                } else {
-                                        skb = alloc_skb(SKB_DATA_SIZE,
-                                                        GFP_ATOMIC);
-                                        if (unlikely(!skb))
-                                                goto no_mem;
-                                }
-
-                                skb_data_init(skb, p, G_RSPD_LEN(len));
-eth_done:
-                                fl->credits--;
-                                q->eth_pkts++;
-                        } else {
-                                fl->credits--;
+                                skb = get_packet_pg(adap, fl, G_RSPD_LEN(len),
+                                                 eth ? SGE_RX_DROP_THRES : 0);
+                        } else
                                 skb = get_packet(adap, fl, G_RSPD_LEN(len),
                                                  eth ? SGE_RX_DROP_THRES : 0);
-                        }
+                        if (unlikely(!skb)) {
+                                if (!eth)
+                                        goto no_mem;
+                                q->rx_drops++;
+                        } else if (unlikely(r->rss_hdr.opcode == CPL_TRACE_PKT))
+                                __skb_pull(skb, 2);
 
                         if (++fl->cidx == fl->size)
                                 fl->cidx = 0;
@@ -2016,20 +2032,15 @@ eth_done:
                         q->credits = 0;
                 }
 
-                if (skb) {
-                        /* Preserve the RSS info in csum & priority */
-                        skb->csum = rss_hi;
-                        skb->priority = rss_lo;
-
+                if (likely(skb != NULL)) {
                         if (eth)
                                 rx_eth(adap, q, skb, ethpad);
                         else {
-                                if (unlikely(r->rss_hdr.opcode ==
-                                             CPL_TRACE_PKT))
-                                        __skb_pull(skb, ethpad);
-
-                                ngathered = rx_offload(&adap->tdev, q,
-                                                       skb, offload_skbs,
+                                /* Preserve the RSS info in csum & priority */
+                                skb->csum = rss_hi;
+                                skb->priority = rss_lo;
+                                ngathered = rx_offload(&adap->tdev, q, skb,
+                                                       offload_skbs,
                                                        ngathered);
                         }
                 }
@@ -2635,25 +2646,15 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
         q->txq[TXQ_ETH].stop_thres = nports *
             flits_to_desc(sgl_len(MAX_SKB_FRAGS + 1) + 3);
 
-        if (!is_offload(adapter)) {
-#ifdef USE_RX_PAGE
-                q->fl[0].buf_size = RX_PAGE_SIZE;
+#if FL0_PG_CHUNK_SIZE > 0
+        q->fl[0].buf_size = FL0_PG_CHUNK_SIZE;
 #else
-                q->fl[0].buf_size = SGE_RX_SM_BUF_SIZE + 2 +
-                    sizeof(struct cpl_rx_pkt);
+        q->fl[0].buf_size = SGE_RX_SM_BUF_SIZE + sizeof(struct cpl_rx_data);
 #endif
-                q->fl[1].buf_size = MAX_FRAME_SIZE + 2 +
-                    sizeof(struct cpl_rx_pkt);
-        } else {
-#ifdef USE_RX_PAGE
-                q->fl[0].buf_size = RX_PAGE_SIZE;
-#else
-                q->fl[0].buf_size = SGE_RX_SM_BUF_SIZE +
-                    sizeof(struct cpl_rx_data);
-#endif
-                q->fl[1].buf_size = (16 * 1024) -
-                    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
-        }
+        q->fl[0].use_pages = FL0_PG_CHUNK_SIZE > 0;
+        q->fl[1].buf_size = is_offload(adapter) ?
+                (16 * 1024) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) :
+                MAX_FRAME_SIZE + 2 + sizeof(struct cpl_rx_pkt);
 
         spin_lock(&adapter->sge.reg_lock);
 
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index fb485d0a43d8..dd3149d94ba8 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -847,6 +847,64 @@ static int t3_write_flash(struct adapter *adapter, unsigned int addr,
         return 0;
 }
 
+/**
+ *      t3_check_tpsram_version - read the tp sram version
+ *      @adapter: the adapter
+ *
+ *      Reads the protocol sram version from serial eeprom.
+ */
+int t3_check_tpsram_version(struct adapter *adapter)
+{
+        int ret;
+        u32 vers;
+        unsigned int major, minor;
+
+        /* Get version loaded in SRAM */
+        t3_write_reg(adapter, A_TP_EMBED_OP_FIELD0, 0);
+        ret = t3_wait_op_done(adapter, A_TP_EMBED_OP_FIELD0,
+                              1, 1, 5, 1);
+        if (ret)
+                return ret;
+        
+        vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+
+        major = G_TP_VERSION_MAJOR(vers);
+        minor = G_TP_VERSION_MINOR(vers);
+
+        if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) 
+                return 0;
+
+        return -EINVAL;
+}
+
+/**
+ *      t3_check_tpsram - check if provided protocol SRAM 
+ *                        is compatible with this driver
+ *      @adapter: the adapter
+ *      @tp_sram: the firmware image to write
+ *      @size: image size
+ *
+ *      Checks if an adapter's tp sram is compatible with the driver.
+ *      Returns 0 if the versions are compatible, a negative error otherwise.
+ */
+int t3_check_tpsram(struct adapter *adapter, u8 *tp_sram, unsigned int size)
+{
+        u32 csum;
+        unsigned int i;
+        const u32 *p = (const u32 *)tp_sram;
+
+        /* Verify checksum */
+        for (csum = 0, i = 0; i < size / sizeof(csum); i++)
+                csum += ntohl(p[i]);
+        if (csum != 0xffffffff) {
+                CH_ERR(adapter, "corrupted protocol SRAM image, checksum %u\n",
+                       csum);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 enum fw_version_type {
         FW_VERSION_N3,
         FW_VERSION_T3
@@ -921,7 +979,7 @@ static int t3_flash_erase_sectors(struct adapter *adapter, int start, int end)
 /*
  *      t3_load_fw - download firmware
  *      @adapter: the adapter
- *      @fw_data: the firrware image to write
+ *      @fw_data: the firmware image to write
  *      @size: image size
  *
  *      Write the supplied firmware image to the card's serial flash.
@@ -2362,7 +2420,7 @@ static void tp_config(struct adapter *adap, const struct tp_params *p)
                      F_TCPCHECKSUMOFFLOAD | V_IPTTL(64));
         t3_write_reg(adap, A_TP_TCP_OPTIONS, V_MTUDEFAULT(576) |
                      F_MTUENABLE | V_WINDOWSCALEMODE(1) |
-                     V_TIMESTAMPSMODE(1) | V_SACKMODE(1) | V_SACKRX(1));
+                     V_TIMESTAMPSMODE(0) | V_SACKMODE(1) | V_SACKRX(1));
         t3_write_reg(adap, A_TP_DACK_CONFIG, V_AUTOSTATE3(1) |
                      V_AUTOSTATE2(1) | V_AUTOSTATE1(0) |
                      V_BYTETHRESHOLD(16384) | V_MSSTHRESHOLD(2) |
@@ -2371,16 +2429,18 @@ static void tp_config(struct adapter *adap, const struct tp_params *p)
                          F_IPV6ENABLE | F_NICMODE);
         t3_write_reg(adap, A_TP_TX_RESOURCE_LIMIT, 0x18141814);
         t3_write_reg(adap, A_TP_PARA_REG4, 0x5050105);
-        t3_set_reg_field(adap, A_TP_PARA_REG6,
-                         adap->params.rev > 0 ? F_ENABLEESND : F_T3A_ENABLEESND,
-                         0);
+        t3_set_reg_field(adap, A_TP_PARA_REG6, 0,
+                         adap->params.rev > 0 ? F_ENABLEESND :
+                         F_T3A_ENABLEESND);
 
         t3_set_reg_field(adap, A_TP_PC_CONFIG,
-                         F_ENABLEEPCMDAFULL | F_ENABLEOCSPIFULL,
-                         F_TXDEFERENABLE | F_HEARBEATDACK | F_TXCONGESTIONMODE |
-                         F_RXCONGESTIONMODE);
+                         F_ENABLEEPCMDAFULL,
+                         F_ENABLEOCSPIFULL |F_TXDEFERENABLE | F_HEARBEATDACK |
+                         F_TXCONGESTIONMODE | F_RXCONGESTIONMODE);
         t3_set_reg_field(adap, A_TP_PC_CONFIG2, F_CHDRAFULL, 0);
-
+        t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1080);
+        t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1000);
+        
         if (adap->params.rev > 0) {
                 tp_wr_indirect(adap, A_TP_EGRESS_CONFIG, F_REWRITEFORCETOSIZE);
                 t3_set_reg_field(adap, A_TP_PARA_REG3, F_TXPACEAUTO,
@@ -2390,9 +2450,10 @@ static void tp_config(struct adapter *adap, const struct tp_params *p)
         } else
                 t3_set_reg_field(adap, A_TP_PARA_REG3, 0, F_TXPACEFIXED);
 
-        t3_write_reg(adap, A_TP_TX_MOD_QUEUE_WEIGHT1, 0x12121212);
-        t3_write_reg(adap, A_TP_TX_MOD_QUEUE_WEIGHT0, 0x12121212);
-        t3_write_reg(adap, A_TP_MOD_CHANNEL_WEIGHT, 0x1212);
+        t3_write_reg(adap, A_TP_TX_MOD_QUEUE_WEIGHT1, 0);
+        t3_write_reg(adap, A_TP_TX_MOD_QUEUE_WEIGHT0, 0);
+        t3_write_reg(adap, A_TP_MOD_CHANNEL_WEIGHT, 0);
+        t3_write_reg(adap, A_TP_MOD_RATE_LIMIT, 0xf2200000);
 }
 
 /* Desired TP timer resolution in usec */
@@ -2468,6 +2529,7 @@ int t3_tp_set_coalescing_size(struct adapter *adap, unsigned int size, int psh)
                 val |= F_RXCOALESCEENABLE;
                 if (psh)
                         val |= F_RXCOALESCEPSHEN;
+                size = min(MAX_RX_COALESCING_LEN, size);
                 t3_write_reg(adap, A_TP_PARA_REG2, V_RXCOALESCESIZE(size) |
                              V_MAXRXDATA(MAX_RX_COALESCING_LEN));
         }
@@ -2496,11 +2558,11 @@ static void __devinit init_mtus(unsigned short mtus[])
          * it can accomodate max size TCP/IP headers when SACK and timestamps
          * are enabled and still have at least 8 bytes of payload.
          */
-        mtus[0] = 88;
-        mtus[1] = 256;
-        mtus[2] = 512;
-        mtus[3] = 576;
-        mtus[4] = 808;
+        mtus[1] = 88;
+        mtus[1] = 88;
+        mtus[2] = 256;
+        mtus[3] = 512;
+        mtus[4] = 576;
         mtus[5] = 1024;
         mtus[6] = 1280;
         mtus[7] = 1492;
@@ -2682,6 +2744,34 @@ static void ulp_config(struct adapter *adap, const struct tp_params *p)
         t3_write_reg(adap, A_ULPRX_TDDP_TAGMASK, 0xffffffff);
 }
 
+/**
+ *      t3_set_proto_sram - set the contents of the protocol sram
+ *      @adapter: the adapter
+ *      @data: the protocol image
+ *
+ *      Write the contents of the protocol SRAM.
+ */
+int t3_set_proto_sram(struct adapter *adap, u8 *data)
+{
+        int i;
+        u32 *buf = (u32 *)data;
+
+        for (i = 0; i < PROTO_SRAM_LINES; i++) {
+                t3_write_reg(adap, A_TP_EMBED_OP_FIELD5, cpu_to_be32(*buf++));
+                t3_write_reg(adap, A_TP_EMBED_OP_FIELD4, cpu_to_be32(*buf++));
+                t3_write_reg(adap, A_TP_EMBED_OP_FIELD3, cpu_to_be32(*buf++));
+                t3_write_reg(adap, A_TP_EMBED_OP_FIELD2, cpu_to_be32(*buf++));
+                t3_write_reg(adap, A_TP_EMBED_OP_FIELD1, cpu_to_be32(*buf++));
+                
+                t3_write_reg(adap, A_TP_EMBED_OP_FIELD0, i << 1 | 1 << 31);
+                if (t3_wait_op_done(adap, A_TP_EMBED_OP_FIELD0, 1, 1, 5, 1))
+                        return -EIO;
+        }
+        t3_write_reg(adap, A_TP_EMBED_OP_FIELD0, 0);
+
+        return 0;
+}
+
 void t3_config_trace_filter(struct adapter *adapter,
                             const struct trace_params *tp, int filter_index,
                             int invert, int enable)
@@ -2802,7 +2892,7 @@ static void init_hw_for_avail_ports(struct adapter *adap, int nports)
                 t3_set_reg_field(adap, A_ULPTX_CONFIG, F_CFG_RR_ARB, 0);
                 t3_write_reg(adap, A_MPS_CFG, F_TPRXPORTEN | F_TPTXPORT0EN |
                              F_PORT0ACTIVE | F_ENFORCEPKT);
-                t3_write_reg(adap, A_PM1_TX_CFG, 0xc000c000);
+                t3_write_reg(adap, A_PM1_TX_CFG, 0xffffffff);
         } else {
                 t3_set_reg_field(adap, A_ULPRX_CTL, 0, F_ROUND_ROBIN);
                 t3_set_reg_field(adap, A_ULPTX_CONFIG, 0, F_CFG_RR_ARB);
@@ -3097,7 +3187,7 @@ int t3_init_hw(struct adapter *adapter, u32 fw_params)
         else
                 t3_set_reg_field(adapter, A_PCIX_CFG, 0, F_CLIDECEN);
 
-        t3_write_reg(adapter, A_PM1_RX_CFG, 0xf000f000);
+        t3_write_reg(adapter, A_PM1_RX_CFG, 0xffffffff);
         init_hw_for_avail_ports(adapter, adapter->params.nports);
         t3_sge_init(adapter, &adapter->params.sge);
 
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index b112317f033e..8eddd23a3a51 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -39,6 +39,6 @@
 
 /* Firmware version */
 #define FW_VERSION_MAJOR 4
-#define FW_VERSION_MINOR 0
+#define FW_VERSION_MINOR 1
 #define FW_VERSION_MICRO 0
 #endif                          /* __CHELSIO_VERSION_H */
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index c0f81b5a30fb..abaf3ac94936 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0064"
+#define DRV_VERSION     "EHEA_0065"
 
 #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
         | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -136,10 +136,10 @@ void ehea_dump(void *adr, int len, char *msg);
         (0xffffffffffffffffULL >> ((64 - (mask)) & 0xffff))
 
 #define EHEA_BMASK_SET(mask, value) \
-        ((EHEA_BMASK_MASK(mask) & ((u64)(value))) << EHEA_BMASK_SHIFTPOS(mask))
+        ((EHEA_BMASK_MASK(mask) & ((u64)(value))) << EHEA_BMASK_SHIFTPOS(mask))
 
 #define EHEA_BMASK_GET(mask, value) \
-        (EHEA_BMASK_MASK(mask) & (((u64)(value)) >> EHEA_BMASK_SHIFTPOS(mask)))
+        (EHEA_BMASK_MASK(mask) & (((u64)(value)) >> EHEA_BMASK_SHIFTPOS(mask)))
 
 /*
  * Generic ehea page
@@ -190,7 +190,7 @@ struct ehea_av;
  * Queue attributes passed to ehea_create_qp()
  */
 struct ehea_qp_init_attr {
-        /* input parameter */
+        /* input parameter */
         u32 qp_token;           /* queue token */
         u8 low_lat_rq1;
         u8 signalingtype;       /* cqe generation flag */
@@ -212,7 +212,7 @@ struct ehea_qp_init_attr {
         u64 recv_cq_handle;
         u64 aff_eq_handle;
 
-        /* output parameter */
+        /* output parameter */
         u32 qp_nr;
         u16 act_nr_send_wqes;
         u16 act_nr_rwqes_rq1;
@@ -279,12 +279,12 @@ struct ehea_qp {
  * Completion Queue attributes
  */
 struct ehea_cq_attr {
-        /* input parameter */
+        /* input parameter */
         u32 max_nr_of_cqes;
         u32 cq_token;
         u64 eq_handle;
 
-        /* output parameter */
+        /* output parameter */
         u32 act_nr_of_cqes;
         u32 nr_pages;
 };
diff --git a/drivers/net/ehea/ehea_hw.h b/drivers/net/ehea/ehea_hw.h
index 1246757f2c22..1af7ca499ec5 100644
--- a/drivers/net/ehea/ehea_hw.h
+++ b/drivers/net/ehea/ehea_hw.h
@@ -211,34 +211,34 @@ static inline void epa_store_acc(struct h_epa epa, u32 offset, u64 value)
 }
 
 #define epa_store_eq(epa, offset, value)\
-        epa_store(epa, EQTEMM_OFFSET(offset), value)
+        epa_store(epa, EQTEMM_OFFSET(offset), value)
 #define epa_load_eq(epa, offset)\
-        epa_load(epa, EQTEMM_OFFSET(offset))
+        epa_load(epa, EQTEMM_OFFSET(offset))
 
 #define epa_store_cq(epa, offset, value)\
-        epa_store(epa, CQTEMM_OFFSET(offset), value)
+        epa_store(epa, CQTEMM_OFFSET(offset), value)
 #define epa_load_cq(epa, offset)\
-        epa_load(epa, CQTEMM_OFFSET(offset))
+        epa_load(epa, CQTEMM_OFFSET(offset))
 
 #define epa_store_qp(epa, offset, value)\
-        epa_store(epa, QPTEMM_OFFSET(offset), value)
+        epa_store(epa, QPTEMM_OFFSET(offset), value)
 #define epa_load_qp(epa, offset)\
-        epa_load(epa, QPTEMM_OFFSET(offset))
+        epa_load(epa, QPTEMM_OFFSET(offset))
 
 #define epa_store_qped(epa, offset, value)\
-        epa_store(epa, QPEDMM_OFFSET(offset), value)
+        epa_store(epa, QPEDMM_OFFSET(offset), value)
 #define epa_load_qped(epa, offset)\
-        epa_load(epa, QPEDMM_OFFSET(offset))
+        epa_load(epa, QPEDMM_OFFSET(offset))
 
 #define epa_store_mrmw(epa, offset, value)\
-        epa_store(epa, MRMWMM_OFFSET(offset), value)
+        epa_store(epa, MRMWMM_OFFSET(offset), value)
 #define epa_load_mrmw(epa, offset)\
-        epa_load(epa, MRMWMM_OFFSET(offset))
+        epa_load(epa, MRMWMM_OFFSET(offset))
 
 #define epa_store_base(epa, offset, value)\
-        epa_store(epa, HCAGR_OFFSET(offset), value)
+        epa_store(epa, HCAGR_OFFSET(offset), value)
 #define epa_load_base(epa, offset)\
-        epa_load(epa, HCAGR_OFFSET(offset))
+        epa_load(epa, HCAGR_OFFSET(offset))
 
 static inline void ehea_update_sqa(struct ehea_qp *qp, u16 nr_wqes)
 {
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 9e13433a268a..bdb52419dbf5 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -81,7 +81,7 @@ MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 1 ");
 static int port_name_cnt = 0;
 
 static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
-                                        const struct of_device_id *id);
+                                        const struct of_device_id *id);
 
 static int __devexit ehea_remove(struct ibmebus_dev *dev);
 
@@ -236,7 +236,7 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr,
 
                 rwqe = ehea_get_next_rwqe(qp, rq_nr);
                 rwqe->wr_id = EHEA_BMASK_SET(EHEA_WR_ID_TYPE, wqe_type)
-                            | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, index);
+                            | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, index);
                 rwqe->sg_list[0].l_key = pr->recv_mr.lkey;
                 rwqe->sg_list[0].vaddr = (u64)skb->data;
                 rwqe->sg_list[0].len = packet_size;
@@ -427,7 +427,7 @@ static struct ehea_cqe *ehea_proc_rwqes(struct net_device *dev,
                                                 break;
                                 }
                                 skb_copy_to_linear_data(skb, ((char*)cqe) + 64,
-                                               cqe->num_bytes_transfered - 4);
+                                                 cqe->num_bytes_transfered - 4);
                                 ehea_fill_skb(port->netdev, skb, cqe);
                         } else if (rq == 2) {  /* RQ2 */
                                 skb = get_skb_by_index(skb_arr_rq2,
@@ -618,7 +618,7 @@ static struct ehea_port *ehea_get_port(struct ehea_adapter *adapter,
 
         for (i = 0; i < EHEA_MAX_PORTS; i++)
                 if (adapter->port[i])
-                        if (adapter->port[i]->logical_port_id == logical_port)
+                        if (adapter->port[i]->logical_port_id == logical_port)
                                 return adapter->port[i];
         return NULL;
 }
@@ -1695,6 +1695,7 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev,
 {
         if (skb->protocol == htons(ETH_P_IP)) {
                 const struct iphdr *iph = ip_hdr(skb);
+
                 /* IPv4 */
                 swqe->tx_control |= EHEA_SWQE_CRC
                                  | EHEA_SWQE_IP_CHECKSUM
@@ -1705,13 +1706,12 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev,
                 write_ip_start_end(swqe, skb);
 
                 if (iph->protocol == IPPROTO_UDP) {
-                        if ((iph->frag_off & IP_MF) ||
-                            (iph->frag_off & IP_OFFSET))
+                        if ((iph->frag_off & IP_MF)
+                            || (iph->frag_off & IP_OFFSET))
                                 /* IP fragment, so don't change cs */
                                 swqe->tx_control &= ~EHEA_SWQE_TCP_CHECKSUM;
                         else
                                 write_udp_offset_end(swqe, skb);
-
                 } else if (iph->protocol == IPPROTO_TCP) {
                         write_tcp_offset_end(swqe, skb);
                 }
@@ -1739,6 +1739,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
 
         if (skb->protocol == htons(ETH_P_IP)) {
                 const struct iphdr *iph = ip_hdr(skb);
+
                 /* IPv4 */
                 write_ip_start_end(swqe, skb);
 
@@ -1751,8 +1752,8 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
                         write_tcp_offset_end(swqe, skb);
 
                 } else if (iph->protocol == IPPROTO_UDP) {
-                        if ((iph->frag_off & IP_MF) ||
-                            (iph->frag_off & IP_OFFSET))
+                        if ((iph->frag_off & IP_MF)
+                            || (iph->frag_off & IP_OFFSET))
                                 /* IP fragment, so don't change cs */
                                 swqe->tx_control |= EHEA_SWQE_CRC
                                                  | EHEA_SWQE_IMM_DATA_PRESENT;
@@ -2407,7 +2408,7 @@ static void __devinit logical_port_release(struct device *dev)
 }
 
 static int ehea_driver_sysfs_add(struct device *dev,
-                                 struct device_driver *driver)
+                                 struct device_driver *driver)
 {
         int ret;
 
@@ -2424,7 +2425,7 @@ static int ehea_driver_sysfs_add(struct device *dev,
 }
 
 static void ehea_driver_sysfs_remove(struct device *dev,
-                                     struct device_driver *driver)
+                                     struct device_driver *driver)
 {
         struct device_driver *drv = driver;
 
@@ -2453,7 +2454,7 @@ static struct device *ehea_register_port(struct ehea_port *port,
         }
 
         ret = device_create_file(&port->ofdev.dev, &dev_attr_log_port_id);
-        if (ret) {
+        if (ret) {
                 ehea_error("failed to register attributes, ret=%d", ret);
                 goto out_unreg_of_dev;
         }
@@ -2601,6 +2602,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
+
         const u32 *dn_log_port_id;
         int i = 0;
 
@@ -2608,7 +2610,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
                 dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
-                                                    NULL);
+                                                 NULL);
                 if (!dn_log_port_id) {
                         ehea_error("bad device node: eth_dn name=%s",
                                    eth_dn->full_name);
@@ -2648,7 +2650,7 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
                 dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
-                                                    NULL);
+                                                 NULL);
                 if (dn_log_port_id)
                         if (*dn_log_port_id == logical_port_id)
                                 return eth_dn;
@@ -2789,7 +2791,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
         adapter->ebus_dev = dev;
 
         adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle",
-                                            NULL);
+                                         NULL);
         if (adapter_handle)
                 adapter->handle = *adapter_handle;
 
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index f24a8862977d..29eaa46948b0 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -211,7 +211,7 @@ u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
         u64 hret;
         u64 adapter_handle = cq->adapter->handle;
 
-        /* deregister all previous registered pages */
+        /* deregister all previous registered pages */
         hret = ehea_h_free_resource(adapter_handle, cq->fw_handle, force);
         if (hret != H_SUCCESS)
                 return hret;
@@ -362,7 +362,7 @@ int ehea_destroy_eq(struct ehea_eq *eq)
         if (hret != H_SUCCESS) {
                 ehea_error("destroy EQ failed");
                 return -EIO;
-        }
+        }
 
         return 0;
 }
@@ -507,44 +507,44 @@ out_freemem:
 
 u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
 {
-        u64 hret;
-        struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
+        u64 hret;
+        struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
 
 
-        ehea_h_disable_and_get_hea(qp->adapter->handle, qp->fw_handle);
-        hret = ehea_h_free_resource(qp->adapter->handle, qp->fw_handle, force);
-        if (hret != H_SUCCESS)
-                return hret;
+        ehea_h_disable_and_get_hea(qp->adapter->handle, qp->fw_handle);
+        hret = ehea_h_free_resource(qp->adapter->handle, qp->fw_handle, force);
+        if (hret != H_SUCCESS)
+                return hret;
 
-        hw_queue_dtor(&qp->hw_squeue);
-        hw_queue_dtor(&qp->hw_rqueue1);
+        hw_queue_dtor(&qp->hw_squeue);
+        hw_queue_dtor(&qp->hw_rqueue1);
 
-        if (qp_attr->rq_count > 1)
-                hw_queue_dtor(&qp->hw_rqueue2);
-        if (qp_attr->rq_count > 2)
-                hw_queue_dtor(&qp->hw_rqueue3);
-        kfree(qp);
+        if (qp_attr->rq_count > 1)
+                hw_queue_dtor(&qp->hw_rqueue2);
+        if (qp_attr->rq_count > 2)
+                hw_queue_dtor(&qp->hw_rqueue3);
+        kfree(qp);
 
-        return hret;
+        return hret;
 }
 
 int ehea_destroy_qp(struct ehea_qp *qp)
 {
-        u64 hret;
-        if (!qp)
-                return 0;
+        u64 hret;
+        if (!qp)
+                return 0;
 
-        if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {
-                ehea_error_data(qp->adapter, qp->fw_handle);
-                hret = ehea_destroy_qp_res(qp, FORCE_FREE);
-        }
+        if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {
+                ehea_error_data(qp->adapter, qp->fw_handle);
+                hret = ehea_destroy_qp_res(qp, FORCE_FREE);
+        }
 
-        if (hret != H_SUCCESS) {
-                ehea_error("destroy QP failed");
-                return -EIO;
-        }
+        if (hret != H_SUCCESS) {
+                ehea_error("destroy QP failed");
+                return -EIO;
+        }
 
-        return 0;
+        return 0;
 }
 
 int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)
diff --git a/drivers/net/fec_8xx/Kconfig b/drivers/net/fec_8xx/Kconfig
index a84c232395e3..afb34ded26ee 100644
--- a/drivers/net/fec_8xx/Kconfig
+++ b/drivers/net/fec_8xx/Kconfig
@@ -1,6 +1,6 @@
 config FEC_8XX
         tristate "Motorola 8xx FEC driver"
-        depends on NET_ETHERNET && 8xx
+        depends on 8XX
         select MII
 
 config FEC_8XX_GENERIC_PHY
diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/fs_enet/Kconfig
index 6aaee67dd4b7..e27ee210b605 100644
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/fs_enet/Kconfig
@@ -1,6 +1,6 @@
 config FS_ENET
        tristate "Freescale Ethernet Driver"
-       depends on NET_ETHERNET && (CPM1 || CPM2)
+       depends on CPM1 || CPM2
        select MII
 
 config FS_ENET_HAS_SCC
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 1b854bf07b09..d7a1a58de766 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -130,6 +130,9 @@ static int gfar_remove(struct platform_device *pdev);
 static void free_skb_resources(struct gfar_private *priv);
 static void gfar_set_multi(struct net_device *dev);
 static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
+static void gfar_configure_serdes(struct net_device *dev);
+extern int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id, int regnum, u16 value);
+extern int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum);
 #ifdef CONFIG_GFAR_NAPI
 static int gfar_poll(struct net_device *dev, int *budget);
 #endif
@@ -451,6 +454,9 @@ static int init_phy(struct net_device *dev)
 
         phydev = phy_connect(dev, phy_id, &adjust_link, 0, interface);
 
+        if (interface == PHY_INTERFACE_MODE_SGMII)
+                gfar_configure_serdes(dev);
+
         if (IS_ERR(phydev)) {
                 printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
                 return PTR_ERR(phydev);
@@ -465,6 +471,27 @@ static int init_phy(struct net_device *dev)
         return 0;
 }
 
+static void gfar_configure_serdes(struct net_device *dev)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+        struct gfar_mii __iomem *regs =
+                        (void __iomem *)&priv->regs->gfar_mii_regs;
+
+        /* Initialise TBI i/f to communicate with serdes (lynx phy) */
+
+        /* Single clk mode, mii mode off(for aerdes communication) */
+        gfar_local_mdio_write(regs, TBIPA_VALUE, MII_TBICON, TBICON_CLK_SELECT);
+
+        /* Supported pause and full-duplex, no half-duplex */
+        gfar_local_mdio_write(regs, TBIPA_VALUE, MII_ADVERTISE,
+                        ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
+                        ADVERTISE_1000XPSE_ASYM);
+
+        /* ANEG enable, restart ANEG, full duplex mode, speed[1] set */
+        gfar_local_mdio_write(regs, TBIPA_VALUE, MII_BMCR, BMCR_ANENABLE |
+                        BMCR_ANRESTART | BMCR_FULLDPLX | BMCR_SPEED1000);
+}
+
 static void init_registers(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 39e9e321fcbc..d8e779c102fa 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -136,6 +136,12 @@ extern const char gfar_driver_version[];
 #define MIIMCFG_RESET           0x80000000
 #define MIIMIND_BUSY            0x00000001
 
+/* TBI register addresses */
+#define MII_TBICON              0x11
+
+/* TBICON register bit fields */
+#define TBICON_CLK_SELECT       0x0020
+
 /* MAC register bits */
 #define MACCFG1_SOFT_RESET      0x80000000
 #define MACCFG1_RESET_RX_MC     0x00080000
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index bcc6b82f4a33..5dd34a1a7b89 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -43,13 +43,18 @@
 #include "gianfar.h"
 #include "gianfar_mii.h"
 
-/* Write value to the PHY at mii_id at register regnum,
- * on the bus, waiting until the write is done before returning.
- * All PHY configuration is done through the TSEC1 MIIM regs */
-int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value)
+/*
+ * Write value to the PHY at mii_id at register regnum,
+ * on the bus attached to the local interface, which may be different from the
+ * generic mdio bus (tied to a single interface), waiting until the write is
+ * done before returning. This is helpful in programming interfaces like
+ * the TBI which control interfaces like onchip SERDES and are always tied to
+ * the local mdio pins, which may not be the same as system mdio bus, used for
+ * controlling the external PHYs, for example.
+ */
+int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id,
+                          int regnum, u16 value)
 {
-        struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
-
         /* Set the PHY address and the register address we want to write */
         gfar_write(&regs->miimadd, (mii_id << 8) | regnum);
 
@@ -63,12 +68,19 @@ int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value)
         return 0;
 }
 
-/* Read the bus for PHY at addr mii_id, register regnum, and
- * return the value.  Clears miimcom first.  All PHY
- * configuration has to be done through the TSEC1 MIIM regs */
-int gfar_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
+/*
+ * Read the bus for PHY at addr mii_id, register regnum, and
+ * return the value.  Clears miimcom first.  All PHY operation
+ * done on the bus attached to the local interface,
+ * which may be different from the generic mdio bus
+ * This is helpful in programming interfaces like
+ * the TBI which, inturn, control interfaces like onchip SERDES
+ * and are always tied to the local mdio pins, which may not be the
+ * same as system mdio bus, used for controlling the external PHYs, for eg.
+ */
+int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum)
+
 {
-        struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
         u16 value;
 
         /* Set the PHY address and the register address we want to read */
@@ -88,6 +100,27 @@ int gfar_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
         return value;
 }
 
+/* Write value to the PHY at mii_id at register regnum,
+ * on the bus, waiting until the write is done before returning.
+ * All PHY configuration is done through the TSEC1 MIIM regs */
+int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value)
+{
+        struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
+
+        /* Write to the local MII regs */
+        return(gfar_local_mdio_write(regs, mii_id, regnum, value));
+}
+
+/* Read the bus for PHY at addr mii_id, register regnum, and
+ * return the value.  Clears miimcom first.  All PHY
+ * configuration has to be done through the TSEC1 MIIM regs */
+int gfar_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
+{
+        struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
+
+        /* Read the local MII regs */
+        return(gfar_local_mdio_read(regs, mii_id, regnum));
+}
 
 /* Reset the MIIM registers, and wait for the bus to free */
 int gfar_mdio_reset(struct mii_bus *bus)
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 741780e14b2c..efbae4b8398e 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -86,93 +86,36 @@
 #include <linux/dma-mapping.h>
 
 #include <asm/io.h>
-#include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/pdc.h>
-#include <asm/cache.h>
 #include <asm/parisc-device.h>
 
 #define LASI_82596_DRIVER_VERSION "LASI 82596 driver - Revision: 1.30"
 
-/* DEBUG flags
- */
-
-#define DEB_INIT        0x0001
-#define DEB_PROBE       0x0002
-#define DEB_SERIOUS     0x0004
-#define DEB_ERRORS      0x0008
-#define DEB_MULTI       0x0010
-#define DEB_TDR         0x0020
-#define DEB_OPEN        0x0040
-#define DEB_RESET       0x0080
-#define DEB_ADDCMD      0x0100
-#define DEB_STATUS      0x0200
-#define DEB_STARTTX     0x0400
-#define DEB_RXADDR      0x0800
-#define DEB_TXADDR      0x1000
-#define DEB_RXFRAME     0x2000
-#define DEB_INTS        0x4000
-#define DEB_STRUCT      0x8000
-#define DEB_ANY         0xffff
-
-
-#define DEB(x,y)        if (i596_debug & (x)) { y; }
-
-
-#define  CHECK_WBACK(priv, addr,len) \
-        do { dma_cache_sync((priv)->dev, (void *)addr, len, DMA_TO_DEVICE); } while (0)
-
-#define  CHECK_INV(priv, addr,len) \
-        do { dma_cache_sync((priv)->dev, (void *)addr, len, DMA_FROM_DEVICE); } while(0)
-
-#define  CHECK_WBACK_INV(priv, addr,len) \
-        do { dma_cache_sync((priv)->dev, (void *)addr, len, DMA_BIDIRECTIONAL); } while (0)
-
-
 #define PA_I82596_RESET         0       /* Offsets relative to LASI-LAN-Addr.*/
 #define PA_CPU_PORT_L_ACCESS    4
 #define PA_CHANNEL_ATTENTION    8
 
+#define OPT_SWAP_PORT   0x0001  /* Need to wordswp on the MPU port */
 
-/*
- * Define various macros for Channel Attention, word swapping etc., dependent
- * on architecture.  MVME and BVME are 680x0 based, otherwise it is Intel.
- */
+#define DMA_ALLOC                        dma_alloc_noncoherent
+#define DMA_FREE                         dma_free_noncoherent
+#define DMA_WBACK(ndev, addr, len) \
+        do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_TO_DEVICE); } while (0)
 
-#ifdef __BIG_ENDIAN
-#define WSWAPrfd(x)  (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define WSWAPrbd(x)  (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define WSWAPiscp(x) (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define WSWAPscb(x)  (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define WSWAPcmd(x)  (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define WSWAPtbd(x)  (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define WSWAPchar(x) (((u32)(x)<<16) | ((((u32)(x)))>>16))
-#define ISCP_BUSY       0x00010000
-#define MACH_IS_APRICOT 0
-#else
-#define WSWAPrfd(x)     ((struct i596_rfd *)(x))
-#define WSWAPrbd(x)     ((struct i596_rbd *)(x))
-#define WSWAPiscp(x)    ((struct i596_iscp *)(x))
-#define WSWAPscb(x)     ((struct i596_scb *)(x))
-#define WSWAPcmd(x)     ((struct i596_cmd *)(x))
-#define WSWAPtbd(x)     ((struct i596_tbd *)(x))
-#define WSWAPchar(x)    ((char *)(x))
-#define ISCP_BUSY       0x0001
-#define MACH_IS_APRICOT 1
-#endif
+#define DMA_INV(ndev, addr, len) \
+        do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_FROM_DEVICE); } while (0)
 
-/*
- * The MPU_PORT command allows direct access to the 82596. With PORT access
- * the following commands are available (p5-18). The 32-bit port command
- * must be word-swapped with the most significant word written first.
- * This only applies to VME boards.
- */
-#define PORT_RESET              0x00    /* reset 82596 */
-#define PORT_SELFTEST           0x01    /* selftest */
-#define PORT_ALTSCP             0x02    /* alternate SCB address */
-#define PORT_ALTDUMP            0x03    /* Alternate DUMP address */
+#define DMA_WBACK_INV(ndev, addr, len) \
+        do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_BIDIRECTIONAL); } while (0)
+
+#define SYSBUS      0x0000006c;
+
+/* big endian CPU, 82596 "big" endian mode */
+#define SWAP32(x)   (((u32)(x)<<16) | ((((u32)(x)))>>16))
+#define SWAP16(x)   (x)
 
-static int i596_debug = (DEB_SERIOUS|DEB_PROBE);
+#include "lib82596.c"
 
 MODULE_AUTHOR("Richard Hirst");
 MODULE_DESCRIPTION("i82596 driver");
@@ -180,255 +123,15 @@ MODULE_LICENSE("GPL");
 module_param(i596_debug, int, 0);
 MODULE_PARM_DESC(i596_debug, "lasi_82596 debug mask");
 
-/* Copy frames shorter than rx_copybreak, otherwise pass on up in
- * a full sized sk_buff.  Value of 100 stolen from tulip.c (!alpha).
- */
-static int rx_copybreak = 100;
-
-#define MAX_DRIVERS     4       /* max count of drivers */
-
-#define PKT_BUF_SZ      1536
-#define MAX_MC_CNT      64
-
-#define I596_NULL ((u32)0xffffffff)
-
-#define CMD_EOL         0x8000  /* The last command of the list, stop. */
-#define CMD_SUSP        0x4000  /* Suspend after doing cmd. */
-#define CMD_INTR        0x2000  /* Interrupt after doing cmd. */
-
-#define CMD_FLEX        0x0008  /* Enable flexible memory model */
-
-enum commands {
-        CmdNOp = 0, CmdSASetup = 1, CmdConfigure = 2, CmdMulticastList = 3,
-        CmdTx = 4, CmdTDR = 5, CmdDump = 6, CmdDiagnose = 7
-};
-
-#define STAT_C          0x8000  /* Set to 0 after execution */
-#define STAT_B          0x4000  /* Command being executed */
-#define STAT_OK         0x2000  /* Command executed ok */
-#define STAT_A          0x1000  /* Command aborted */
-
-#define  CUC_START      0x0100
-#define  CUC_RESUME     0x0200
-#define  CUC_SUSPEND    0x0300
-#define  CUC_ABORT      0x0400
-#define  RX_START       0x0010
-#define  RX_RESUME      0x0020
-#define  RX_SUSPEND     0x0030
-#define  RX_ABORT       0x0040
-
-#define TX_TIMEOUT      5
-
-#define OPT_SWAP_PORT   0x0001  /* Need to wordswp on the MPU port */
-
-
-struct i596_reg {
-        unsigned short porthi;
-        unsigned short portlo;
-        u32            ca;
-};
-
-#define EOF             0x8000
-#define SIZE_MASK       0x3fff
-
-struct i596_tbd {
-        unsigned short size;
-        unsigned short pad;
-        dma_addr_t     next;
-        dma_addr_t     data;
-        u32 cache_pad[5];               /* Total 32 bytes... */
-};
-
-/* The command structure has two 'next' pointers; v_next is the address of
- * the next command as seen by the CPU, b_next is the address of the next
- * command as seen by the 82596.  The b_next pointer, as used by the 82596
- * always references the status field of the next command, rather than the
- * v_next field, because the 82596 is unaware of v_next.  It may seem more
- * logical to put v_next at the end of the structure, but we cannot do that
- * because the 82596 expects other fields to be there, depending on command
- * type.
- */
-
-struct i596_cmd {
-        struct i596_cmd *v_next;        /* Address from CPUs viewpoint */
-        unsigned short status;
-        unsigned short command;
-        dma_addr_t     b_next;  /* Address from i596 viewpoint */
-};
-
-struct tx_cmd {
-        struct i596_cmd cmd;
-        dma_addr_t     tbd;
-        unsigned short size;
-        unsigned short pad;
-        struct sk_buff *skb;            /* So we can free it after tx */
-        dma_addr_t dma_addr;
-#ifdef __LP64__
-        u32 cache_pad[6];               /* Total 64 bytes... */
-#else
-        u32 cache_pad[1];               /* Total 32 bytes... */
-#endif
-};
-
-struct tdr_cmd {
-        struct i596_cmd cmd;
-        unsigned short status;
-        unsigned short pad;
-};
-
-struct mc_cmd {
-        struct i596_cmd cmd;
-        short mc_cnt;
-        char mc_addrs[MAX_MC_CNT*6];
-};
-
-struct sa_cmd {
-        struct i596_cmd cmd;
-        char eth_addr[8];
-};
-
-struct cf_cmd {
-        struct i596_cmd cmd;
-        char i596_config[16];
-};
-
-struct i596_rfd {
-        unsigned short stat;
-        unsigned short cmd;
-        dma_addr_t     b_next;  /* Address from i596 viewpoint */
-        dma_addr_t     rbd;
-        unsigned short count;
-        unsigned short size;
-        struct i596_rfd *v_next;        /* Address from CPUs viewpoint */
-        struct i596_rfd *v_prev;
-#ifndef __LP64__
-        u32 cache_pad[2];               /* Total 32 bytes... */
-#endif
-};
-
-struct i596_rbd {
-    /* hardware data */
-    unsigned short count;
-    unsigned short zero1;
-    dma_addr_t     b_next;
-    dma_addr_t     b_data;              /* Address from i596 viewpoint */
-    unsigned short size;
-    unsigned short zero2;
-    /* driver data */
-    struct sk_buff *skb;
-    struct i596_rbd *v_next;
-    dma_addr_t     b_addr;              /* This rbd addr from i596 view */
-    unsigned char *v_data;              /* Address from CPUs viewpoint */
-                                        /* Total 32 bytes... */
-#ifdef __LP64__
-    u32 cache_pad[4];
-#endif
-};
-
-/* These values as chosen so struct i596_private fits in one page... */
-
-#define TX_RING_SIZE 32
-#define RX_RING_SIZE 16
-
-struct i596_scb {
-        unsigned short status;
-        unsigned short command;
-        dma_addr_t    cmd;
-        dma_addr_t    rfd;
-        u32           crc_err;
-        u32           align_err;
-        u32           resource_err;
-        u32           over_err;
-        u32           rcvdt_err;
-        u32           short_err;
-        unsigned short t_on;
-        unsigned short t_off;
-};
-
-struct i596_iscp {
-        u32           stat;
-        dma_addr_t    scb;
-};
-
-struct i596_scp {
-        u32           sysbus;
-        u32            pad;
-        dma_addr_t    iscp;
-};
-
-struct i596_private {
-        volatile struct i596_scp scp            __attribute__((aligned(32)));
-        volatile struct i596_iscp iscp          __attribute__((aligned(32)));
-        volatile struct i596_scb scb            __attribute__((aligned(32)));
-        struct sa_cmd sa_cmd                    __attribute__((aligned(32)));
-        struct cf_cmd cf_cmd                    __attribute__((aligned(32)));
-        struct tdr_cmd tdr_cmd                  __attribute__((aligned(32)));
-        struct mc_cmd mc_cmd                    __attribute__((aligned(32)));
-        struct i596_rfd rfds[RX_RING_SIZE]      __attribute__((aligned(32)));
-        struct i596_rbd rbds[RX_RING_SIZE]      __attribute__((aligned(32)));
-        struct tx_cmd tx_cmds[TX_RING_SIZE]     __attribute__((aligned(32)));
-        struct i596_tbd tbds[TX_RING_SIZE]      __attribute__((aligned(32)));
-        u32    stat;
-        int last_restart;
-        struct i596_rfd *rfd_head;
-        struct i596_rbd *rbd_head;
-        struct i596_cmd *cmd_tail;
-        struct i596_cmd *cmd_head;
-        int cmd_backlog;
-        u32    last_cmd;
-        struct net_device_stats stats;
-        int next_tx_cmd;
-        int options;
-        spinlock_t lock;
-        dma_addr_t dma_addr;
-        struct device *dev;
-};
-
-static const char init_setup[] =
-{
-        0x8E,                   /* length, prefetch on */
-        0xC8,                   /* fifo to 8, monitor off */
-        0x80,                   /* don't save bad frames */
-        0x2E,                   /* No source address insertion, 8 byte preamble */
-        0x00,                   /* priority and backoff defaults */
-        0x60,                   /* interframe spacing */
-        0x00,                   /* slot time LSB */
-        0xf2,                   /* slot time and retries */
-        0x00,                   /* promiscuous mode */
-        0x00,                   /* collision detect */
-        0x40,                   /* minimum frame length */
-        0xff,
-        0x00,
-        0x7f /*  *multi IA */ };
-
-static int i596_open(struct net_device *dev);
-static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t i596_interrupt(int irq, void *dev_id);
-static int i596_close(struct net_device *dev);
-static struct net_device_stats *i596_get_stats(struct net_device *dev);
-static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd);
-static void i596_tx_timeout (struct net_device *dev);
-static void print_eth(unsigned char *buf, char *str);
-static void set_multicast_list(struct net_device *dev);
-
-static int rx_ring_size = RX_RING_SIZE;
-static int ticks_limit = 100;
-static int max_cmd_backlog = TX_RING_SIZE-1;
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void i596_poll_controller(struct net_device *dev);
-#endif
-
-
-static inline void CA(struct net_device *dev)
+static inline void ca(struct net_device *dev)
 {
         gsc_writel(0, dev->base_addr + PA_CHANNEL_ATTENTION);
 }
 
 
-static inline void MPU_PORT(struct net_device *dev, int c, dma_addr_t x)
+static void mpu_port(struct net_device *dev, int c, dma_addr_t x)
 {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
 
         u32 v = (u32) (c) | (u32) (x);
         u16 a, b;
@@ -446,1078 +149,15 @@ static inline void MPU_PORT(struct net_device *dev, int c, dma_addr_t x)
         gsc_writel(b, dev->base_addr + PA_CPU_PORT_L_ACCESS);
 }
 
-
-static inline int wait_istat(struct net_device *dev, struct i596_private *lp, int delcnt, char *str)
-{
-        CHECK_INV(lp, &(lp->iscp), sizeof(struct i596_iscp));
-        while (--delcnt && lp->iscp.stat) {
-                udelay(10);
-                CHECK_INV(lp, &(lp->iscp), sizeof(struct i596_iscp));
-        }
-        if (!delcnt) {
-                printk("%s: %s, iscp.stat %04x, didn't clear\n",
-                     dev->name, str, lp->iscp.stat);
-                return -1;
-        }
-        else
-                return 0;
-}
-
-
-static inline int wait_cmd(struct net_device *dev, struct i596_private *lp, int delcnt, char *str)
-{
-        CHECK_INV(lp, &(lp->scb), sizeof(struct i596_scb));
-        while (--delcnt && lp->scb.command) {
-                udelay(10);
-                CHECK_INV(lp, &(lp->scb), sizeof(struct i596_scb));
-        }
-        if (!delcnt) {
-                printk("%s: %s, status %4.4x, cmd %4.4x.\n",
-                     dev->name, str, lp->scb.status, lp->scb.command);
-                return -1;
-        }
-        else
-                return 0;
-}
-
-
-static void i596_display_data(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        struct i596_cmd *cmd;
-        struct i596_rfd *rfd;
-        struct i596_rbd *rbd;
-
-        printk("lp and scp at %p, .sysbus = %08x, .iscp = %08x\n",
-               &lp->scp, lp->scp.sysbus, lp->scp.iscp);
-        printk("iscp at %p, iscp.stat = %08x, .scb = %08x\n",
-               &lp->iscp, lp->iscp.stat, lp->iscp.scb);
-        printk("scb at %p, scb.status = %04x, .command = %04x,"
-                " .cmd = %08x, .rfd = %08x\n",
-               &lp->scb, lp->scb.status, lp->scb.command,
-                lp->scb.cmd, lp->scb.rfd);
-        printk("   errors: crc %x, align %x, resource %x,"
-               " over %x, rcvdt %x, short %x\n",
-                lp->scb.crc_err, lp->scb.align_err, lp->scb.resource_err,
-                lp->scb.over_err, lp->scb.rcvdt_err, lp->scb.short_err);
-        cmd = lp->cmd_head;
-        while (cmd != NULL) {
-                printk("cmd at %p, .status = %04x, .command = %04x, .b_next = %08x\n",
-                  cmd, cmd->status, cmd->command, cmd->b_next);
-                cmd = cmd->v_next;
-        }
-        rfd = lp->rfd_head;
-        printk("rfd_head = %p\n", rfd);
-        do {
-                printk("   %p .stat %04x, .cmd %04x, b_next %08x, rbd %08x,"
-                        " count %04x\n",
-                        rfd, rfd->stat, rfd->cmd, rfd->b_next, rfd->rbd,
-                        rfd->count);
-                rfd = rfd->v_next;
-        } while (rfd != lp->rfd_head);
-        rbd = lp->rbd_head;
-        printk("rbd_head = %p\n", rbd);
-        do {
-                printk("   %p .count %04x, b_next %08x, b_data %08x, size %04x\n",
-                        rbd, rbd->count, rbd->b_next, rbd->b_data, rbd->size);
-                rbd = rbd->v_next;
-        } while (rbd != lp->rbd_head);
-        CHECK_INV(lp, lp, sizeof(struct i596_private));
-}
-
-
-#if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET)
-static void i596_error(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000;
-
-        pcc2[0x28] = 1;
-        pcc2[0x2b] = 0x1d;
-        printk("%s: Error interrupt\n", dev->name);
-        i596_display_data(dev);
-}
-#endif
-
-#define virt_to_dma(lp,v) ((lp)->dma_addr + (dma_addr_t)((unsigned long)(v)-(unsigned long)(lp)))
-
-static inline void init_rx_bufs(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        int i;
-        struct i596_rfd *rfd;
-        struct i596_rbd *rbd;
-
-        /* First build the Receive Buffer Descriptor List */
-
-        for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
-                dma_addr_t dma_addr;
-                struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ + 4);
-
-                if (skb == NULL)
-                        panic("%s: alloc_skb() failed", __FILE__);
-                skb_reserve(skb, 2);
-                dma_addr = dma_map_single(lp->dev, skb->data,PKT_BUF_SZ,
-                                          DMA_FROM_DEVICE);
-                skb->dev = dev;
-                rbd->v_next = rbd+1;
-                rbd->b_next = WSWAPrbd(virt_to_dma(lp,rbd+1));
-                rbd->b_addr = WSWAPrbd(virt_to_dma(lp,rbd));
-                rbd->skb = skb;
-                rbd->v_data = skb->data;
-                rbd->b_data = WSWAPchar(dma_addr);
-                rbd->size = PKT_BUF_SZ;
-        }
-        lp->rbd_head = lp->rbds;
-        rbd = lp->rbds + rx_ring_size - 1;
-        rbd->v_next = lp->rbds;
-        rbd->b_next = WSWAPrbd(virt_to_dma(lp,lp->rbds));
-
-        /* Now build the Receive Frame Descriptor List */
-
-        for (i = 0, rfd = lp->rfds; i < rx_ring_size; i++, rfd++) {
-                rfd->rbd = I596_NULL;
-                rfd->v_next = rfd+1;
-                rfd->v_prev = rfd-1;
-                rfd->b_next = WSWAPrfd(virt_to_dma(lp,rfd+1));
-                rfd->cmd = CMD_FLEX;
-        }
-        lp->rfd_head = lp->rfds;
-        lp->scb.rfd = WSWAPrfd(virt_to_dma(lp,lp->rfds));
-        rfd = lp->rfds;
-        rfd->rbd = WSWAPrbd(virt_to_dma(lp,lp->rbd_head));
-        rfd->v_prev = lp->rfds + rx_ring_size - 1;
-        rfd = lp->rfds + rx_ring_size - 1;
-        rfd->v_next = lp->rfds;
-        rfd->b_next = WSWAPrfd(virt_to_dma(lp,lp->rfds));
-        rfd->cmd = CMD_EOL|CMD_FLEX;
-
-        CHECK_WBACK_INV(lp, lp, sizeof(struct i596_private));
-}
-
-static inline void remove_rx_bufs(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        struct i596_rbd *rbd;
-        int i;
-
-        for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
-                if (rbd->skb == NULL)
-                        break;
-                dma_unmap_single(lp->dev,
-                                 (dma_addr_t)WSWAPchar(rbd->b_data),
-                                 PKT_BUF_SZ, DMA_FROM_DEVICE);
-                dev_kfree_skb(rbd->skb);
-        }
-}
-
-
-static void rebuild_rx_bufs(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        int i;
-
-        /* Ensure rx frame/buffer descriptors are tidy */
-
-        for (i = 0; i < rx_ring_size; i++) {
-                lp->rfds[i].rbd = I596_NULL;
-                lp->rfds[i].cmd = CMD_FLEX;
-        }
-        lp->rfds[rx_ring_size-1].cmd = CMD_EOL|CMD_FLEX;
-        lp->rfd_head = lp->rfds;
-        lp->scb.rfd = WSWAPrfd(virt_to_dma(lp,lp->rfds));
-        lp->rbd_head = lp->rbds;
-        lp->rfds[0].rbd = WSWAPrbd(virt_to_dma(lp,lp->rbds));
-
-        CHECK_WBACK_INV(lp, lp, sizeof(struct i596_private));
-}
-
-
-static int init_i596_mem(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        unsigned long flags;
-
-        disable_irq(dev->irq);  /* disable IRQs from LAN */
-        DEB(DEB_INIT,
-                printk("RESET 82596 port: %lx (with IRQ %d disabled)\n",
-                       (dev->base_addr + PA_I82596_RESET),
-                       dev->irq));
-
-        gsc_writel(0, (dev->base_addr + PA_I82596_RESET)); /* Hard Reset */
-        udelay(100);                    /* Wait 100us - seems to help */
-
-        /* change the scp address */
-
-        lp->last_cmd = jiffies;
-
-
-        lp->scp.sysbus = 0x0000006c;
-        lp->scp.iscp = WSWAPiscp(virt_to_dma(lp,&(lp->iscp)));
-        lp->iscp.scb = WSWAPscb(virt_to_dma(lp,&(lp->scb)));
-        lp->iscp.stat = ISCP_BUSY;
-        lp->cmd_backlog = 0;
-
-        lp->cmd_head = NULL;
-        lp->scb.cmd = I596_NULL;
-
-        DEB(DEB_INIT, printk("%s: starting i82596.\n", dev->name));
-
-        CHECK_WBACK(lp, &(lp->scp), sizeof(struct i596_scp));
-        CHECK_WBACK(lp, &(lp->iscp), sizeof(struct i596_iscp));
-
-        MPU_PORT(dev, PORT_ALTSCP, virt_to_dma(lp,&lp->scp));
-
-        CA(dev);
-
-        if (wait_istat(dev, lp, 1000, "initialization timed out"))
-                goto failed;
-        DEB(DEB_INIT, printk("%s: i82596 initialization successful\n", dev->name));
-
-        /* Ensure rx frame/buffer descriptors are tidy */
-        rebuild_rx_bufs(dev);
-
-        lp->scb.command = 0;
-        CHECK_WBACK(lp, &(lp->scb), sizeof(struct i596_scb));
-
-        enable_irq(dev->irq);   /* enable IRQs from LAN */
-
-        DEB(DEB_INIT, printk("%s: queuing CmdConfigure\n", dev->name));
-        memcpy(lp->cf_cmd.i596_config, init_setup, sizeof(init_setup));
-        lp->cf_cmd.cmd.command = CmdConfigure;
-        CHECK_WBACK(lp, &(lp->cf_cmd), sizeof(struct cf_cmd));
-        i596_add_cmd(dev, &lp->cf_cmd.cmd);
-
-        DEB(DEB_INIT, printk("%s: queuing CmdSASetup\n", dev->name));
-        memcpy(lp->sa_cmd.eth_addr, dev->dev_addr, 6);
-        lp->sa_cmd.cmd.command = CmdSASetup;
-        CHECK_WBACK(lp, &(lp->sa_cmd), sizeof(struct sa_cmd));
-        i596_add_cmd(dev, &lp->sa_cmd.cmd);
-
-        DEB(DEB_INIT, printk("%s: queuing CmdTDR\n", dev->name));
-        lp->tdr_cmd.cmd.command = CmdTDR;
-        CHECK_WBACK(lp, &(lp->tdr_cmd), sizeof(struct tdr_cmd));
-        i596_add_cmd(dev, &lp->tdr_cmd.cmd);
-
-        spin_lock_irqsave (&lp->lock, flags);
-
-        if (wait_cmd(dev, lp, 1000, "timed out waiting to issue RX_START")) {
-                spin_unlock_irqrestore (&lp->lock, flags);
-                goto failed;
-        }
-        DEB(DEB_INIT, printk("%s: Issuing RX_START\n", dev->name));
-        lp->scb.command = RX_START;
-        lp->scb.rfd = WSWAPrfd(virt_to_dma(lp,lp->rfds));
-        CHECK_WBACK(lp, &(lp->scb), sizeof(struct i596_scb));
-
-        CA(dev);
-
-        spin_unlock_irqrestore (&lp->lock, flags);
-
-        if (wait_cmd(dev, lp, 1000, "RX_START not processed"))
-                goto failed;
-        DEB(DEB_INIT, printk("%s: Receive unit started OK\n", dev->name));
-
-        return 0;
-
-failed:
-        printk("%s: Failed to initialise 82596\n", dev->name);
-        MPU_PORT(dev, PORT_RESET, 0);
-        return -1;
-}
-
-
-static inline int i596_rx(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        struct i596_rfd *rfd;
-        struct i596_rbd *rbd;
-        int frames = 0;
-
-        DEB(DEB_RXFRAME, printk("i596_rx(), rfd_head %p, rbd_head %p\n",
-                        lp->rfd_head, lp->rbd_head));
-
-
-        rfd = lp->rfd_head;             /* Ref next frame to check */
-
-        CHECK_INV(lp, rfd, sizeof(struct i596_rfd));
-        while ((rfd->stat) & STAT_C) {  /* Loop while complete frames */
-                if (rfd->rbd == I596_NULL)
-                        rbd = NULL;
-                else if (rfd->rbd == lp->rbd_head->b_addr) {
-                        rbd = lp->rbd_head;
-                        CHECK_INV(lp, rbd, sizeof(struct i596_rbd));
-                }
-                else {
-                        printk("%s: rbd chain broken!\n", dev->name);
-                        /* XXX Now what? */
-                        rbd = NULL;
-                }
-                DEB(DEB_RXFRAME, printk("  rfd %p, rfd.rbd %08x, rfd.stat %04x\n",
-                        rfd, rfd->rbd, rfd->stat));
-
-                if (rbd != NULL && ((rfd->stat) & STAT_OK)) {
-                        /* a good frame */
-                        int pkt_len = rbd->count & 0x3fff;
-                        struct sk_buff *skb = rbd->skb;
-                        int rx_in_place = 0;
-
-                        DEB(DEB_RXADDR,print_eth(rbd->v_data, "received"));
-                        frames++;
-
-                        /* Check if the packet is long enough to just accept
-                         * without copying to a properly sized skbuff.
-                         */
-
-                        if (pkt_len > rx_copybreak) {
-                                struct sk_buff *newskb;
-                                dma_addr_t dma_addr;
-
-                                dma_unmap_single(lp->dev,(dma_addr_t)WSWAPchar(rbd->b_data), PKT_BUF_SZ, DMA_FROM_DEVICE);
-                                /* Get fresh skbuff to replace filled one. */
-                                newskb = dev_alloc_skb(PKT_BUF_SZ + 4);
-                                if (newskb == NULL) {
-                                        skb = NULL;     /* drop pkt */
-                                        goto memory_squeeze;
-                                }
-                                skb_reserve(newskb, 2);
-
-                                /* Pass up the skb already on the Rx ring. */
-                                skb_put(skb, pkt_len);
-                                rx_in_place = 1;
-                                rbd->skb = newskb;
-                                newskb->dev = dev;
-                                dma_addr = dma_map_single(lp->dev, newskb->data, PKT_BUF_SZ, DMA_FROM_DEVICE);
-                                rbd->v_data = newskb->data;
-                                rbd->b_data = WSWAPchar(dma_addr);
-                                CHECK_WBACK_INV(lp, rbd, sizeof(struct i596_rbd));
-                        }
-                        else
-                                skb = dev_alloc_skb(pkt_len + 2);
-memory_squeeze:
-                        if (skb == NULL) {
-                                /* XXX tulip.c can defer packets here!! */
-                                printk("%s: i596_rx Memory squeeze, dropping packet.\n", dev->name);
-                                lp->stats.rx_dropped++;
-                        }
-                        else {
-                                if (!rx_in_place) {
-                                        /* 16 byte align the data fields */
-                                        dma_sync_single_for_cpu(lp->dev, (dma_addr_t)WSWAPchar(rbd->b_data), PKT_BUF_SZ, DMA_FROM_DEVICE);
-                                        skb_reserve(skb, 2);
-                                        memcpy(skb_put(skb,pkt_len), rbd->v_data, pkt_len);
-                                        dma_sync_single_for_device(lp->dev, (dma_addr_t)WSWAPchar(rbd->b_data), PKT_BUF_SZ, DMA_FROM_DEVICE);
-                                }
-                                skb->len = pkt_len;
-                                skb->protocol=eth_type_trans(skb,dev);
-                                netif_rx(skb);
-                                dev->last_rx = jiffies;
-                                lp->stats.rx_packets++;
-                                lp->stats.rx_bytes+=pkt_len;
-                        }
-                }
-                else {
-                        DEB(DEB_ERRORS, printk("%s: Error, rfd.stat = 0x%04x\n",
-                                        dev->name, rfd->stat));
-                        lp->stats.rx_errors++;
-                        if ((rfd->stat) & 0x0001)
-                                lp->stats.collisions++;
-                        if ((rfd->stat) & 0x0080)
-                                lp->stats.rx_length_errors++;
-                        if ((rfd->stat) & 0x0100)
-                                lp->stats.rx_over_errors++;
-                        if ((rfd->stat) & 0x0200)
-                                lp->stats.rx_fifo_errors++;
-                        if ((rfd->stat) & 0x0400)
-                                lp->stats.rx_frame_errors++;
-                        if ((rfd->stat) & 0x0800)
-                                lp->stats.rx_crc_errors++;
-                        if ((rfd->stat) & 0x1000)
-                                lp->stats.rx_length_errors++;
-                }
-
-                /* Clear the buffer descriptor count and EOF + F flags */
-
-                if (rbd != NULL && (rbd->count & 0x4000)) {
-                        rbd->count = 0;
-                        lp->rbd_head = rbd->v_next;
-                        CHECK_WBACK_INV(lp, rbd, sizeof(struct i596_rbd));
-                }
-
-                /* Tidy the frame descriptor, marking it as end of list */
-
-                rfd->rbd = I596_NULL;
-                rfd->stat = 0;
-                rfd->cmd = CMD_EOL|CMD_FLEX;
-                rfd->count = 0;
-
-                /* Remove end-of-list from old end descriptor */
-
-                rfd->v_prev->cmd = CMD_FLEX;
-
-                /* Update record of next frame descriptor to process */
-
-                lp->scb.rfd = rfd->b_next;
-                lp->rfd_head = rfd->v_next;
-                CHECK_WBACK_INV(lp, rfd->v_prev, sizeof(struct i596_rfd));
-                CHECK_WBACK_INV(lp, rfd, sizeof(struct i596_rfd));
-                rfd = lp->rfd_head;
-                CHECK_INV(lp, rfd, sizeof(struct i596_rfd));
-        }
-
-        DEB(DEB_RXFRAME, printk("frames %d\n", frames));
-
-        return 0;
-}
-
-
-static inline void i596_cleanup_cmd(struct net_device *dev, struct i596_private *lp)
-{
-        struct i596_cmd *ptr;
-
-        while (lp->cmd_head != NULL) {
-                ptr = lp->cmd_head;
-                lp->cmd_head = ptr->v_next;
-                lp->cmd_backlog--;
-
-                switch ((ptr->command) & 0x7) {
-                case CmdTx:
-                        {
-                                struct tx_cmd *tx_cmd = (struct tx_cmd *) ptr;
-                                struct sk_buff *skb = tx_cmd->skb;
-                                dma_unmap_single(lp->dev, tx_cmd->dma_addr, skb->len, DMA_TO_DEVICE);
-
-                                dev_kfree_skb(skb);
-
-                                lp->stats.tx_errors++;
-                                lp->stats.tx_aborted_errors++;
-
-                                ptr->v_next = NULL;
-                                ptr->b_next = I596_NULL;
-                                tx_cmd->cmd.command = 0;  /* Mark as free */
-                                break;
-                        }
-                default:
-                        ptr->v_next = NULL;
-                        ptr->b_next = I596_NULL;
-                }
-                CHECK_WBACK_INV(lp, ptr, sizeof(struct i596_cmd));
-        }
-
-        wait_cmd(dev, lp, 100, "i596_cleanup_cmd timed out");
-        lp->scb.cmd = I596_NULL;
-        CHECK_WBACK(lp, &(lp->scb), sizeof(struct i596_scb));
-}
-
-
-static inline void i596_reset(struct net_device *dev, struct i596_private *lp)
-{
-        unsigned long flags;
-
-        DEB(DEB_RESET, printk("i596_reset\n"));
-
-        spin_lock_irqsave (&lp->lock, flags);
-
-        wait_cmd(dev, lp, 100, "i596_reset timed out");
-
-        netif_stop_queue(dev);
-
-        /* FIXME: this command might cause an lpmc */
-        lp->scb.command = CUC_ABORT | RX_ABORT;
-        CHECK_WBACK(lp, &(lp->scb), sizeof(struct i596_scb));
-        CA(dev);
-
-        /* wait for shutdown */
-        wait_cmd(dev, lp, 1000, "i596_reset 2 timed out");
-        spin_unlock_irqrestore (&lp->lock, flags);
-
-        i596_cleanup_cmd(dev,lp);
-        i596_rx(dev);
-
-        netif_start_queue(dev);
-        init_i596_mem(dev);
-}
-
-
-static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd)
-{
-        struct i596_private *lp = dev->priv;
-        unsigned long flags;
-
-        DEB(DEB_ADDCMD, printk("i596_add_cmd cmd_head %p\n", lp->cmd_head));
-
-        cmd->status = 0;
-        cmd->command |= (CMD_EOL | CMD_INTR);
-        cmd->v_next = NULL;
-        cmd->b_next = I596_NULL;
-        CHECK_WBACK(lp, cmd, sizeof(struct i596_cmd));
-
-        spin_lock_irqsave (&lp->lock, flags);
-
-        if (lp->cmd_head != NULL) {
-                lp->cmd_tail->v_next = cmd;
-                lp->cmd_tail->b_next = WSWAPcmd(virt_to_dma(lp,&cmd->status));
-                CHECK_WBACK(lp, lp->cmd_tail, sizeof(struct i596_cmd));
-        } else {
-                lp->cmd_head = cmd;
-                wait_cmd(dev, lp, 100, "i596_add_cmd timed out");
-                lp->scb.cmd = WSWAPcmd(virt_to_dma(lp,&cmd->status));
-                lp->scb.command = CUC_START;
-                CHECK_WBACK(lp, &(lp->scb), sizeof(struct i596_scb));
-                CA(dev);
-        }
-        lp->cmd_tail = cmd;
-        lp->cmd_backlog++;
-
-        spin_unlock_irqrestore (&lp->lock, flags);
-
-        if (lp->cmd_backlog > max_cmd_backlog) {
-                unsigned long tickssofar = jiffies - lp->last_cmd;
-
-                if (tickssofar < ticks_limit)
-                        return;
-
-                printk("%s: command unit timed out, status resetting.\n", dev->name);
-#if 1
-                i596_reset(dev, lp);
-#endif
-        }
-}
-
-#if 0
-/* this function makes a perfectly adequate probe...  but we have a
-   device list */
-static int i596_test(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        volatile int *tint;
-        u32 data;
-
-        tint = (volatile int *)(&(lp->scp));
-        data = virt_to_dma(lp,tint);
-
-        tint[1] = -1;
-        CHECK_WBACK(lp, tint, PAGE_SIZE);
-
-        MPU_PORT(dev, 1, data);
-
-        for(data = 1000000; data; data--) {
-                CHECK_INV(lp, tint, PAGE_SIZE);
-                if(tint[1] != -1)
-                        break;
-
-        }
-
-        printk("i596_test result %d\n", tint[1]);
-
-}
-#endif
-
-
-static int i596_open(struct net_device *dev)
-{
-        DEB(DEB_OPEN, printk("%s: i596_open() irq %d.\n", dev->name, dev->irq));
-
-        if (request_irq(dev->irq, &i596_interrupt, 0, "i82596", dev)) {
-                printk("%s: IRQ %d not free\n", dev->name, dev->irq);
-                goto out;
-        }
-
-        init_rx_bufs(dev);
-
-        if (init_i596_mem(dev)) {
-                printk("%s: Failed to init memory\n", dev->name);
-                goto out_remove_rx_bufs;
-        }
-
-        netif_start_queue(dev);
-
-        return 0;
-
-out_remove_rx_bufs:
-        remove_rx_bufs(dev);
-        free_irq(dev->irq, dev);
-out:
-        return -EAGAIN;
-}
-
-static void i596_tx_timeout (struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-
-        /* Transmitter timeout, serious problems. */
-        DEB(DEB_ERRORS, printk("%s: transmit timed out, status resetting.\n",
-                        dev->name));
-
-        lp->stats.tx_errors++;
-
-        /* Try to restart the adaptor */
-        if (lp->last_restart == lp->stats.tx_packets) {
-                DEB(DEB_ERRORS, printk("Resetting board.\n"));
-                /* Shutdown and restart */
-                i596_reset (dev, lp);
-        } else {
-                /* Issue a channel attention signal */
-                DEB(DEB_ERRORS, printk("Kicking board.\n"));
-                lp->scb.command = CUC_START | RX_START;
-                CHECK_WBACK_INV(lp, &(lp->scb), sizeof(struct i596_scb));
-                CA (dev);
-                lp->last_restart = lp->stats.tx_packets;
-        }
-
-        dev->trans_start = jiffies;
-        netif_wake_queue (dev);
-}
-
-
-static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        struct tx_cmd *tx_cmd;
-        struct i596_tbd *tbd;
-        short length = skb->len;
-        dev->trans_start = jiffies;
-
-        DEB(DEB_STARTTX, printk("%s: i596_start_xmit(%x,%p) called\n", dev->name,
-                                skb->len, skb->data));
-
-        if (length < ETH_ZLEN) {
-                if (skb_padto(skb, ETH_ZLEN))
-                        return 0;
-                length = ETH_ZLEN;
-        }
-
-        netif_stop_queue(dev);
-
-        tx_cmd = lp->tx_cmds + lp->next_tx_cmd;
-        tbd = lp->tbds + lp->next_tx_cmd;
-
-        if (tx_cmd->cmd.command) {
-                DEB(DEB_ERRORS, printk("%s: xmit ring full, dropping packet.\n",
-                                dev->name));
-                lp->stats.tx_dropped++;
-
-                dev_kfree_skb(skb);
-        } else {
-                if (++lp->next_tx_cmd == TX_RING_SIZE)
-                        lp->next_tx_cmd = 0;
-                tx_cmd->tbd = WSWAPtbd(virt_to_dma(lp,tbd));
-                tbd->next = I596_NULL;
-
-                tx_cmd->cmd.command = CMD_FLEX | CmdTx;
-                tx_cmd->skb = skb;
-
-                tx_cmd->pad = 0;
-                tx_cmd->size = 0;
-                tbd->pad = 0;
-                tbd->size = EOF | length;
-
-                tx_cmd->dma_addr = dma_map_single(lp->dev, skb->data, skb->len,
-                                DMA_TO_DEVICE);
-                tbd->data = WSWAPchar(tx_cmd->dma_addr);
-
-                DEB(DEB_TXADDR,print_eth(skb->data, "tx-queued"));
-                CHECK_WBACK_INV(lp, tx_cmd, sizeof(struct tx_cmd));
-                CHECK_WBACK_INV(lp, tbd, sizeof(struct i596_tbd));
-                i596_add_cmd(dev, &tx_cmd->cmd);
-
-                lp->stats.tx_packets++;
-                lp->stats.tx_bytes += length;
-        }
-
-        netif_start_queue(dev);
-
-        return 0;
-}
-
-static void print_eth(unsigned char *add, char *str)
-{
-        int i;
-
-        printk("i596 0x%p, ", add);
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i + 6]);
-        printk(" -->");
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i]);
-        printk(" %02X%02X, %s\n", add[12], add[13], str);
-}
-
-
 #define LAN_PROM_ADDR   0xF0810000
 
-static int __devinit i82596_probe(struct net_device *dev,
-                                  struct device *gen_dev)
-{
-        int i;
-        struct i596_private *lp;
-        char eth_addr[6];
-        dma_addr_t dma_addr;
-
-        /* This lot is ensure things have been cache line aligned. */
-        BUILD_BUG_ON(sizeof(struct i596_rfd) != 32);
-        BUILD_BUG_ON(sizeof(struct i596_rbd) &  31);
-        BUILD_BUG_ON(sizeof(struct tx_cmd)   &  31);
-        BUILD_BUG_ON(sizeof(struct i596_tbd) != 32);
-#ifndef __LP64__
-        BUILD_BUG_ON(sizeof(struct i596_private) > 4096);
-#endif
-
-        if (!dev->base_addr || !dev->irq)
-                return -ENODEV;
-
-        if (pdc_lan_station_id(eth_addr, dev->base_addr)) {
-                for (i=0; i < 6; i++) {
-                        eth_addr[i] = gsc_readb(LAN_PROM_ADDR + i);
-                }
-                printk(KERN_INFO "%s: MAC of HP700 LAN read from EEPROM\n", __FILE__);
-        }
-
-        dev->mem_start = (unsigned long) dma_alloc_noncoherent(gen_dev,
-                sizeof(struct i596_private), &dma_addr, GFP_KERNEL);
-        if (!dev->mem_start) {
-                printk(KERN_ERR "%s: Couldn't get shared memory\n", __FILE__);
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = eth_addr[i];
-
-        /* The 82596-specific entries in the device structure. */
-        dev->open = i596_open;
-        dev->stop = i596_close;
-        dev->hard_start_xmit = i596_start_xmit;
-        dev->get_stats = i596_get_stats;
-        dev->set_multicast_list = set_multicast_list;
-        dev->tx_timeout = i596_tx_timeout;
-        dev->watchdog_timeo = TX_TIMEOUT;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = i596_poll_controller;
-#endif
-
-        dev->priv = (void *)(dev->mem_start);
-
-        lp = dev->priv;
-        memset(lp, 0, sizeof(struct i596_private));
-
-        lp->scb.command = 0;
-        lp->scb.cmd = I596_NULL;
-        lp->scb.rfd = I596_NULL;
-        spin_lock_init(&lp->lock);
-        lp->dma_addr = dma_addr;
-        lp->dev = gen_dev;
-
-        CHECK_WBACK_INV(lp, dev->mem_start, sizeof(struct i596_private));
-
-        i = register_netdev(dev);
-        if (i) {
-                lp = dev->priv;
-                dma_free_noncoherent(lp->dev, sizeof(struct i596_private),
-                                    (void *)dev->mem_start, lp->dma_addr);
-                return i;
-        };
-
-        DEB(DEB_PROBE, printk(KERN_INFO "%s: 82596 at %#3lx,", dev->name, dev->base_addr));
-        for (i = 0; i < 6; i++)
-                DEB(DEB_PROBE, printk(" %2.2X", dev->dev_addr[i]));
-        DEB(DEB_PROBE, printk(" IRQ %d.\n", dev->irq));
-        DEB(DEB_INIT, printk(KERN_INFO "%s: lp at 0x%p (%d bytes), lp->scb at 0x%p\n",
-                dev->name, lp, (int)sizeof(struct i596_private), &lp->scb));
-
-        return 0;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void i596_poll_controller(struct net_device *dev)
-{
-        disable_irq(dev->irq);
-        i596_interrupt(dev->irq, dev);
-        enable_irq(dev->irq);
-}
-#endif
-
-static irqreturn_t i596_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        struct i596_private *lp;
-        unsigned short status, ack_cmd = 0;
-
-        if (dev == NULL) {
-                printk("%s: irq %d for unknown device.\n", __FUNCTION__, irq);
-                return IRQ_NONE;
-        }
-
-        lp = dev->priv;
-
-        spin_lock (&lp->lock);
-
-        wait_cmd(dev, lp, 100, "i596 interrupt, timeout");
-        status = lp->scb.status;
-
-        DEB(DEB_INTS, printk("%s: i596 interrupt, IRQ %d, status %4.4x.\n",
-                        dev->name, irq, status));
-
-        ack_cmd = status & 0xf000;
-
-        if (!ack_cmd) {
-                DEB(DEB_ERRORS, printk("%s: interrupt with no events\n", dev->name));
-                spin_unlock (&lp->lock);
-                return IRQ_NONE;
-        }
-
-        if ((status & 0x8000) || (status & 0x2000)) {
-                struct i596_cmd *ptr;
-
-                if ((status & 0x8000))
-                        DEB(DEB_INTS, printk("%s: i596 interrupt completed command.\n", dev->name));
-                if ((status & 0x2000))
-                        DEB(DEB_INTS, printk("%s: i596 interrupt command unit inactive %x.\n", dev->name, status & 0x0700));
-
-                while (lp->cmd_head != NULL) {
-                        CHECK_INV(lp, lp->cmd_head, sizeof(struct i596_cmd));
-                        if (!(lp->cmd_head->status & STAT_C))
-                                break;
-
-                        ptr = lp->cmd_head;
-
-                        DEB(DEB_STATUS, printk("cmd_head->status = %04x, ->command = %04x\n",
-                                       lp->cmd_head->status, lp->cmd_head->command));
-                        lp->cmd_head = ptr->v_next;
-                        lp->cmd_backlog--;
-
-                        switch ((ptr->command) & 0x7) {
-                        case CmdTx:
-                            {
-                                struct tx_cmd *tx_cmd = (struct tx_cmd *) ptr;
-                                struct sk_buff *skb = tx_cmd->skb;
-
-                                if ((ptr->status) & STAT_OK) {
-                                        DEB(DEB_TXADDR, print_eth(skb->data, "tx-done"));
-                                } else {
-                                        lp->stats.tx_errors++;
-                                        if ((ptr->status) & 0x0020)
-                                                lp->stats.collisions++;
-                                        if (!((ptr->status) & 0x0040))
-                                                lp->stats.tx_heartbeat_errors++;
-                                        if ((ptr->status) & 0x0400)
-                                                lp->stats.tx_carrier_errors++;
-                                        if ((ptr->status) & 0x0800)
-                                                lp->stats.collisions++;
-                                        if ((ptr->status) & 0x1000)
-                                                lp->stats.tx_aborted_errors++;
-                                }
-                                dma_unmap_single(lp->dev, tx_cmd->dma_addr, skb->len, DMA_TO_DEVICE);
-                                dev_kfree_skb_irq(skb);
-
-                                tx_cmd->cmd.command = 0; /* Mark free */
-                                break;
-                            }
-                        case CmdTDR:
-                            {
-                                unsigned short status = ((struct tdr_cmd *)ptr)->status;
-
-                                if (status & 0x8000) {
-                                        DEB(DEB_ANY, printk("%s: link ok.\n", dev->name));
-                                } else {
-                                        if (status & 0x4000)
-                                                printk("%s: Transceiver problem.\n", dev->name);
-                                        if (status & 0x2000)
-                                                printk("%s: Termination problem.\n", dev->name);
-                                        if (status & 0x1000)
-                                                printk("%s: Short circuit.\n", dev->name);
-
-                                        DEB(DEB_TDR, printk("%s: Time %d.\n", dev->name, status & 0x07ff));
-                                }
-                                break;
-                            }
-                        case CmdConfigure:
-                                /* Zap command so set_multicast_list() knows it is free */
-                                ptr->command = 0;
-                                break;
-                        }
-                        ptr->v_next = NULL;
-                        ptr->b_next = I596_NULL;
-                        CHECK_WBACK(lp, ptr, sizeof(struct i596_cmd));
-                        lp->last_cmd = jiffies;
-                }
-
-                /* This mess is arranging that only the last of any outstanding
-                 * commands has the interrupt bit set.  Should probably really
-                 * only add to the cmd queue when the CU is stopped.
-                 */
-                ptr = lp->cmd_head;
-                while ((ptr != NULL) && (ptr != lp->cmd_tail)) {
-                        struct i596_cmd *prev = ptr;
-
-                        ptr->command &= 0x1fff;
-                        ptr = ptr->v_next;
-                        CHECK_WBACK_INV(lp, prev, sizeof(struct i596_cmd));
-                }
-
-                if ((lp->cmd_head != NULL))
-                        ack_cmd |= CUC_START;
-                lp->scb.cmd = WSWAPcmd(virt_to_dma(lp,&lp->cmd_head->status));
-                CHECK_WBACK_INV(lp, &lp->scb, sizeof(struct i596_scb));
-        }
-        if ((status & 0x1000) || (status & 0x4000)) {
-                if ((status & 0x4000))
-                        DEB(DEB_INTS, printk("%s: i596 interrupt received a frame.\n", dev->name));
-                i596_rx(dev);
-                /* Only RX_START if stopped - RGH 07-07-96 */
-                if (status & 0x1000) {
-                        if (netif_running(dev)) {
-                                DEB(DEB_ERRORS, printk("%s: i596 interrupt receive unit inactive, status 0x%x\n", dev->name, status));
-                                ack_cmd |= RX_START;
-                                lp->stats.rx_errors++;
-                                lp->stats.rx_fifo_errors++;
-                                rebuild_rx_bufs(dev);
-                        }
-                }
-        }
-        wait_cmd(dev, lp, 100, "i596 interrupt, timeout");
-        lp->scb.command = ack_cmd;
-        CHECK_WBACK(lp, &lp->scb, sizeof(struct i596_scb));
-
-        /* DANGER: I suspect that some kind of interrupt
-         acknowledgement aside from acking the 82596 might be needed
-         here...  but it's running acceptably without */
-
-        CA(dev);
-
-        wait_cmd(dev, lp, 100, "i596 interrupt, exit timeout");
-        DEB(DEB_INTS, printk("%s: exiting interrupt.\n", dev->name));
-
-        spin_unlock (&lp->lock);
-        return IRQ_HANDLED;
-}
-
-static int i596_close(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        unsigned long flags;
-
-        netif_stop_queue(dev);
-
-        DEB(DEB_INIT, printk("%s: Shutting down ethercard, status was %4.4x.\n",
-                       dev->name, lp->scb.status));
-
-        spin_lock_irqsave(&lp->lock, flags);
-
-        wait_cmd(dev, lp, 100, "close1 timed out");
-        lp->scb.command = CUC_ABORT | RX_ABORT;
-        CHECK_WBACK(lp, &lp->scb, sizeof(struct i596_scb));
-
-        CA(dev);
-
-        wait_cmd(dev, lp, 100, "close2 timed out");
-        spin_unlock_irqrestore(&lp->lock, flags);
-        DEB(DEB_STRUCT,i596_display_data(dev));
-        i596_cleanup_cmd(dev,lp);
-
-        disable_irq(dev->irq);
-
-        free_irq(dev->irq, dev);
-        remove_rx_bufs(dev);
-
-        return 0;
-}
-
-static struct net_device_stats *
- i596_get_stats(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-
-        return &lp->stats;
-}
-
-/*
- *    Set or clear the multicast filter for this adaptor.
- */
-
-static void set_multicast_list(struct net_device *dev)
-{
-        struct i596_private *lp = dev->priv;
-        int config = 0, cnt;
-
-        DEB(DEB_MULTI, printk("%s: set multicast list, %d entries, promisc %s, allmulti %s\n",
-                dev->name, dev->mc_count, dev->flags & IFF_PROMISC ? "ON" : "OFF",
-                dev->flags & IFF_ALLMULTI ? "ON" : "OFF"));
-
-        if ((dev->flags & IFF_PROMISC) && !(lp->cf_cmd.i596_config[8] & 0x01)) {
-                lp->cf_cmd.i596_config[8] |= 0x01;
-                config = 1;
-        }
-        if (!(dev->flags & IFF_PROMISC) && (lp->cf_cmd.i596_config[8] & 0x01)) {
-                lp->cf_cmd.i596_config[8] &= ~0x01;
-                config = 1;
-        }
-        if ((dev->flags & IFF_ALLMULTI) && (lp->cf_cmd.i596_config[11] & 0x20)) {
-                lp->cf_cmd.i596_config[11] &= ~0x20;
-                config = 1;
-        }
-        if (!(dev->flags & IFF_ALLMULTI) && !(lp->cf_cmd.i596_config[11] & 0x20)) {
-                lp->cf_cmd.i596_config[11] |= 0x20;
-                config = 1;
-        }
-        if (config) {
-                if (lp->cf_cmd.cmd.command)
-                        printk("%s: config change request already queued\n",
-                               dev->name);
-                else {
-                        lp->cf_cmd.cmd.command = CmdConfigure;
-                        CHECK_WBACK_INV(lp, &lp->cf_cmd, sizeof(struct cf_cmd));
-                        i596_add_cmd(dev, &lp->cf_cmd.cmd);
-                }
-        }
-
-        cnt = dev->mc_count;
-        if (cnt > MAX_MC_CNT)
-        {
-                cnt = MAX_MC_CNT;
-                printk("%s: Only %d multicast addresses supported",
-                        dev->name, cnt);
-        }
-
-        if (dev->mc_count > 0) {
-                struct dev_mc_list *dmi;
-                unsigned char *cp;
-                struct mc_cmd *cmd;
-
-                cmd = &lp->mc_cmd;
-                cmd->cmd.command = CmdMulticastList;
-                cmd->mc_cnt = dev->mc_count * 6;
-                cp = cmd->mc_addrs;
-                for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
-                        memcpy(cp, dmi->dmi_addr, 6);
-                        if (i596_debug > 1)
-                                DEB(DEB_MULTI, printk("%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                                dev->name, cp[0],cp[1],cp[2],cp[3],cp[4],cp[5]));
-                }
-                CHECK_WBACK_INV(lp, &lp->mc_cmd, sizeof(struct mc_cmd));
-                i596_add_cmd(dev, &cmd->cmd);
-        }
-}
-
-static int debug = -1;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "lasi_82596 debug mask");
-
-static int num_drivers;
-static struct net_device *netdevs[MAX_DRIVERS];
-
 static int __devinit
 lan_init_chip(struct parisc_device *dev)
 {
         struct  net_device *netdevice;
+        struct i596_private *lp;
         int     retval;
-
-        if (num_drivers >= MAX_DRIVERS) {
-                /* max count of possible i82596 drivers reached */
-                return -ENOMEM;
-        }
-
-        if (num_drivers == 0)
-                printk(KERN_INFO LASI_82596_DRIVER_VERSION "\n");
+        int i;
 
         if (!dev->irq) {
                 printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
@@ -1528,28 +168,45 @@ lan_init_chip(struct parisc_device *dev)
         printk(KERN_INFO "Found i82596 at 0x%lx, IRQ %d\n", dev->hpa.start,
                         dev->irq);
 
-        netdevice = alloc_etherdev(0);
+        netdevice = alloc_etherdev(sizeof(struct i596_private));
         if (!netdevice)
                 return -ENOMEM;
+        SET_NETDEV_DEV(netdevice, &dev->dev);
+        parisc_set_drvdata (dev, netdevice);
 
         netdevice->base_addr = dev->hpa.start;
         netdevice->irq = dev->irq;
 
-        retval = i82596_probe(netdevice, &dev->dev);
+        if (pdc_lan_station_id(netdevice->dev_addr, netdevice->base_addr)) {
+                for (i = 0; i < 6; i++) {
+                        netdevice->dev_addr[i] = gsc_readb(LAN_PROM_ADDR + i);
+                }
+                printk(KERN_INFO
+                       "%s: MAC of HP700 LAN read from EEPROM\n", __FILE__);
+        }
+
+        lp = netdev_priv(netdevice);
+        lp->options = dev->id.sversion == 0x72 ? OPT_SWAP_PORT : 0;
+
+        retval = i82596_probe(netdevice);
         if (retval) {
                 free_netdev(netdevice);
                 return -ENODEV;
         }
-
-        if (dev->id.sversion == 0x72) {
-                ((struct i596_private *)netdevice->priv)->options = OPT_SWAP_PORT;
-        }
-
-        netdevs[num_drivers++] = netdevice;
-
         return retval;
 }
 
+static int __devexit lan_remove_chip (struct parisc_device *pdev)
+{
+        struct net_device *dev = parisc_get_drvdata(pdev);
+        struct i596_private *lp = netdev_priv(dev);
+
+        unregister_netdev (dev);
+        DMA_FREE(&pdev->dev, sizeof(struct i596_private),
+                 (void *)lp->dma, lp->dma_addr);
+        free_netdev (dev);
+        return 0;
+}
 
 static struct parisc_device_id lan_tbl[] = {
         { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008a },
@@ -1563,12 +220,12 @@ static struct parisc_driver lan_driver = {
         .name           = "lasi_82596",
         .id_table       = lan_tbl,
         .probe          = lan_init_chip,
+        .remove         = __devexit_p(lan_remove_chip),
 };
 
 static int __devinit lasi_82596_init(void)
 {
-        if (debug >= 0)
-                i596_debug = debug;
+        printk(KERN_INFO LASI_82596_DRIVER_VERSION "\n");
         return register_parisc_driver(&lan_driver);
 }
 
@@ -1576,25 +233,6 @@ module_init(lasi_82596_init);
 
 static void __exit lasi_82596_exit(void)
 {
-        int i;
-
-        for (i=0; i<MAX_DRIVERS; i++) {
-                struct i596_private *lp;
-                struct net_device *netdevice;
-
-                netdevice = netdevs[i];
-                if (!netdevice)
-                        continue;
-
-                unregister_netdev(netdevice);
-
-                lp = netdevice->priv;
-                dma_free_noncoherent(lp->dev, sizeof(struct i596_private),
-                                       (void *)netdevice->mem_start, lp->dma_addr);
-                free_netdev(netdevice);
-        }
-        num_drivers = 0;
-
         unregister_parisc_driver(&lan_driver);
 }
 
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
new file mode 100644
index 000000000000..5884f5bd04a4
--- /dev/null
+++ b/drivers/net/lib82596.c
@@ -0,0 +1,1434 @@
+/* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
+   munged into HPPA boxen .
+
+   This driver is based upon 82596.c, original credits are below...
+   but there were too many hoops which HP wants jumped through to
+   keep this code in there in a sane manner.
+
+   3 primary sources of the mess --
+   1) hppa needs *lots* of cacheline flushing to keep this kind of
+   MMIO running.
+
+   2) The 82596 needs to see all of its pointers as their physical
+   address.  Thus virt_to_bus/bus_to_virt are *everywhere*.
+
+   3) The implementation HP is using seems to be significantly pickier
+   about when and how the command and RX units are started.  some
+   command ordering was changed.
+
+   Examination of the mach driver leads one to believe that there
+   might be a saner way to pull this off...  anyone who feels like a
+   full rewrite can be my guest.
+
+   Split 02/13/2000 Sam Creasey (sammy@oh.verio.com)
+
+   02/01/2000  Initial modifications for parisc by Helge Deller (deller@gmx.de)
+   03/02/2000  changes for better/correct(?) cache-flushing (deller)
+*/
+
+/* 82596.c: A generic 82596 ethernet driver for linux. */
+/*
+   Based on Apricot.c
+   Written 1994 by Mark Evans.
+   This driver is for the Apricot 82596 bus-master interface
+
+   Modularised 12/94 Mark Evans
+
+
+   Modified to support the 82596 ethernet chips on 680x0 VME boards.
+   by Richard Hirst <richard@sleepie.demon.co.uk>
+   Renamed to be 82596.c
+
+   980825:  Changed to receive directly in to sk_buffs which are
+   allocated at open() time.  Eliminates copy on incoming frames
+   (small ones are still copied).  Shared data now held in a
+   non-cached page, so we can run on 68060 in copyback mode.
+
+   TBD:
+   * look at deferring rx frames rather than discarding (as per tulip)
+   * handle tx ring full as per tulip
+   * performace test to tune rx_copybreak
+
+   Most of my modifications relate to the braindead big-endian
+   implementation by Intel.  When the i596 is operating in
+   'big-endian' mode, it thinks a 32 bit value of 0x12345678
+   should be stored as 0x56781234.  This is a real pain, when
+   you have linked lists which are shared by the 680x0 and the
+   i596.
+
+   Driver skeleton
+   Written 1993 by Donald Becker.
+   Copyright 1993 United States Government as represented by the Director,
+   National Security Agency. This software may only be used and distributed
+   according to the terms of the GNU General Public License as modified by SRC,
+   incorporated herein by reference.
+
+   The author may be reached as becker@scyld.com, or C/O
+   Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
+
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+
+/* DEBUG flags
+ */
+
+#define DEB_INIT        0x0001
+#define DEB_PROBE       0x0002
+#define DEB_SERIOUS     0x0004
+#define DEB_ERRORS      0x0008
+#define DEB_MULTI       0x0010
+#define DEB_TDR         0x0020
+#define DEB_OPEN        0x0040
+#define DEB_RESET       0x0080
+#define DEB_ADDCMD      0x0100
+#define DEB_STATUS      0x0200
+#define DEB_STARTTX     0x0400
+#define DEB_RXADDR      0x0800
+#define DEB_TXADDR      0x1000
+#define DEB_RXFRAME     0x2000
+#define DEB_INTS        0x4000
+#define DEB_STRUCT      0x8000
+#define DEB_ANY         0xffff
+
+
+#define DEB(x, y)       if (i596_debug & (x)) { y; }
+
+
+/*
+ * The MPU_PORT command allows direct access to the 82596. With PORT access
+ * the following commands are available (p5-18). The 32-bit port command
+ * must be word-swapped with the most significant word written first.
+ * This only applies to VME boards.
+ */
+#define PORT_RESET              0x00    /* reset 82596 */
+#define PORT_SELFTEST           0x01    /* selftest */
+#define PORT_ALTSCP             0x02    /* alternate SCB address */
+#define PORT_ALTDUMP            0x03    /* Alternate DUMP address */
+
+static int i596_debug = (DEB_SERIOUS|DEB_PROBE);
+
+/* Copy frames shorter than rx_copybreak, otherwise pass on up in
+ * a full sized sk_buff.  Value of 100 stolen from tulip.c (!alpha).
+ */
+static int rx_copybreak = 100;
+
+#define PKT_BUF_SZ      1536
+#define MAX_MC_CNT      64
+
+#define ISCP_BUSY       0x0001
+
+#define I596_NULL ((u32)0xffffffff)
+
+#define CMD_EOL         0x8000  /* The last command of the list, stop. */
+#define CMD_SUSP        0x4000  /* Suspend after doing cmd. */
+#define CMD_INTR        0x2000  /* Interrupt after doing cmd. */
+
+#define CMD_FLEX        0x0008  /* Enable flexible memory model */
+
+enum commands {
+        CmdNOp = 0, CmdSASetup = 1, CmdConfigure = 2, CmdMulticastList = 3,
+        CmdTx = 4, CmdTDR = 5, CmdDump = 6, CmdDiagnose = 7
+};
+
+#define STAT_C          0x8000  /* Set to 0 after execution */
+#define STAT_B          0x4000  /* Command being executed */
+#define STAT_OK         0x2000  /* Command executed ok */
+#define STAT_A          0x1000  /* Command aborted */
+
+#define  CUC_START      0x0100
+#define  CUC_RESUME     0x0200
+#define  CUC_SUSPEND    0x0300
+#define  CUC_ABORT      0x0400
+#define  RX_START       0x0010
+#define  RX_RESUME      0x0020
+#define  RX_SUSPEND     0x0030
+#define  RX_ABORT       0x0040
+
+#define TX_TIMEOUT      5
+
+
+struct i596_reg {
+        unsigned short porthi;
+        unsigned short portlo;
+        u32            ca;
+};
+
+#define EOF             0x8000
+#define SIZE_MASK       0x3fff
+
+struct i596_tbd {
+        unsigned short size;
+        unsigned short pad;
+        dma_addr_t     next;
+        dma_addr_t     data;
+        u32 cache_pad[5];               /* Total 32 bytes... */
+};
+
+/* The command structure has two 'next' pointers; v_next is the address of
+ * the next command as seen by the CPU, b_next is the address of the next
+ * command as seen by the 82596.  The b_next pointer, as used by the 82596
+ * always references the status field of the next command, rather than the
+ * v_next field, because the 82596 is unaware of v_next.  It may seem more
+ * logical to put v_next at the end of the structure, but we cannot do that
+ * because the 82596 expects other fields to be there, depending on command
+ * type.
+ */
+
+struct i596_cmd {
+        struct i596_cmd *v_next;        /* Address from CPUs viewpoint */
+        unsigned short status;
+        unsigned short command;
+        dma_addr_t     b_next;  /* Address from i596 viewpoint */
+};
+
+struct tx_cmd {
+        struct i596_cmd cmd;
+        dma_addr_t     tbd;
+        unsigned short size;
+        unsigned short pad;
+        struct sk_buff *skb;            /* So we can free it after tx */
+        dma_addr_t dma_addr;
+#ifdef __LP64__
+        u32 cache_pad[6];               /* Total 64 bytes... */
+#else
+        u32 cache_pad[1];               /* Total 32 bytes... */
+#endif
+};
+
+struct tdr_cmd {
+        struct i596_cmd cmd;
+        unsigned short status;
+        unsigned short pad;
+};
+
+struct mc_cmd {
+        struct i596_cmd cmd;
+        short mc_cnt;
+        char mc_addrs[MAX_MC_CNT*6];
+};
+
+struct sa_cmd {
+        struct i596_cmd cmd;
+        char eth_addr[8];
+};
+
+struct cf_cmd {
+        struct i596_cmd cmd;
+        char i596_config[16];
+};
+
+struct i596_rfd {
+        unsigned short stat;
+        unsigned short cmd;
+        dma_addr_t     b_next;  /* Address from i596 viewpoint */
+        dma_addr_t     rbd;
+        unsigned short count;
+        unsigned short size;
+        struct i596_rfd *v_next;        /* Address from CPUs viewpoint */
+        struct i596_rfd *v_prev;
+#ifndef __LP64__
+        u32 cache_pad[2];               /* Total 32 bytes... */
+#endif
+};
+
+struct i596_rbd {
+    /* hardware data */
+    unsigned short count;
+    unsigned short zero1;
+    dma_addr_t     b_next;
+    dma_addr_t     b_data;              /* Address from i596 viewpoint */
+    unsigned short size;
+    unsigned short zero2;
+    /* driver data */
+    struct sk_buff *skb;
+    struct i596_rbd *v_next;
+    dma_addr_t     b_addr;              /* This rbd addr from i596 view */
+    unsigned char *v_data;              /* Address from CPUs viewpoint */
+                                        /* Total 32 bytes... */
+#ifdef __LP64__
+    u32 cache_pad[4];
+#endif
+};
+
+/* These values as chosen so struct i596_dma fits in one page... */
+
+#define TX_RING_SIZE 32
+#define RX_RING_SIZE 16
+
+struct i596_scb {
+        unsigned short status;
+        unsigned short command;
+        dma_addr_t    cmd;
+        dma_addr_t    rfd;
+        u32           crc_err;
+        u32           align_err;
+        u32           resource_err;
+        u32           over_err;
+        u32           rcvdt_err;
+        u32           short_err;
+        unsigned short t_on;
+        unsigned short t_off;
+};
+
+struct i596_iscp {
+        u32           stat;
+        dma_addr_t    scb;
+};
+
+struct i596_scp {
+        u32           sysbus;
+        u32           pad;
+        dma_addr_t    iscp;
+};
+
+struct i596_dma {
+        struct i596_scp scp                     __attribute__((aligned(32)));
+        volatile struct i596_iscp iscp          __attribute__((aligned(32)));
+        volatile struct i596_scb scb            __attribute__((aligned(32)));
+        struct sa_cmd sa_cmd                    __attribute__((aligned(32)));
+        struct cf_cmd cf_cmd                    __attribute__((aligned(32)));
+        struct tdr_cmd tdr_cmd                  __attribute__((aligned(32)));
+        struct mc_cmd mc_cmd                    __attribute__((aligned(32)));
+        struct i596_rfd rfds[RX_RING_SIZE]      __attribute__((aligned(32)));
+        struct i596_rbd rbds[RX_RING_SIZE]      __attribute__((aligned(32)));
+        struct tx_cmd tx_cmds[TX_RING_SIZE]     __attribute__((aligned(32)));
+        struct i596_tbd tbds[TX_RING_SIZE]      __attribute__((aligned(32)));
+};
+
+struct i596_private {
+        struct i596_dma *dma;
+        u32    stat;
+        int last_restart;
+        struct i596_rfd *rfd_head;
+        struct i596_rbd *rbd_head;
+        struct i596_cmd *cmd_tail;
+        struct i596_cmd *cmd_head;
+        int cmd_backlog;
+        u32    last_cmd;
+        struct net_device_stats stats;
+        int next_tx_cmd;
+        int options;
+        spinlock_t lock;       /* serialize access to chip */
+        dma_addr_t dma_addr;
+        void __iomem *mpu_port;
+        void __iomem *ca;
+};
+
+static const char init_setup[] =
+{
+        0x8E,           /* length, prefetch on */
+        0xC8,           /* fifo to 8, monitor off */
+        0x80,           /* don't save bad frames */
+        0x2E,           /* No source address insertion, 8 byte preamble */
+        0x00,           /* priority and backoff defaults */
+        0x60,           /* interframe spacing */
+        0x00,           /* slot time LSB */
+        0xf2,           /* slot time and retries */
+        0x00,           /* promiscuous mode */
+        0x00,           /* collision detect */
+        0x40,           /* minimum frame length */
+        0xff,
+        0x00,
+        0x7f /*  *multi IA */ };
+
+static int i596_open(struct net_device *dev);
+static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static irqreturn_t i596_interrupt(int irq, void *dev_id);
+static int i596_close(struct net_device *dev);
+static struct net_device_stats *i596_get_stats(struct net_device *dev);
+static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd);
+static void i596_tx_timeout (struct net_device *dev);
+static void print_eth(unsigned char *buf, char *str);
+static void set_multicast_list(struct net_device *dev);
+static inline void ca(struct net_device *dev);
+static void mpu_port(struct net_device *dev, int c, dma_addr_t x);
+
+static int rx_ring_size = RX_RING_SIZE;
+static int ticks_limit = 100;
+static int max_cmd_backlog = TX_RING_SIZE-1;
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void i596_poll_controller(struct net_device *dev);
+#endif
+
+
+static inline int wait_istat(struct net_device *dev, struct i596_dma *dma, int delcnt, char *str)
+{
+        DMA_INV(dev, &(dma->iscp), sizeof(struct i596_iscp));
+        while (--delcnt && dma->iscp.stat) {
+                udelay(10);
+                DMA_INV(dev, &(dma->iscp), sizeof(struct i596_iscp));
+        }
+        if (!delcnt) {
+                printk(KERN_ERR "%s: %s, iscp.stat %04x, didn't clear\n",
+                     dev->name, str, SWAP16(dma->iscp.stat));
+                return -1;
+        } else
+                return 0;
+}
+
+
+static inline int wait_cmd(struct net_device *dev, struct i596_dma *dma, int delcnt, char *str)
+{
+        DMA_INV(dev, &(dma->scb), sizeof(struct i596_scb));
+        while (--delcnt && dma->scb.command) {
+                udelay(10);
+                DMA_INV(dev, &(dma->scb), sizeof(struct i596_scb));
+        }
+        if (!delcnt) {
+                printk(KERN_ERR "%s: %s, status %4.4x, cmd %4.4x.\n",
+                       dev->name, str,
+                       SWAP16(dma->scb.status),
+                       SWAP16(dma->scb.command));
+                return -1;
+        } else
+                return 0;
+}
+
+
+static void i596_display_data(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma = lp->dma;
+        struct i596_cmd *cmd;
+        struct i596_rfd *rfd;
+        struct i596_rbd *rbd;
+
+        printk(KERN_DEBUG "lp and scp at %p, .sysbus = %08x, .iscp = %08x\n",
+               &dma->scp, dma->scp.sysbus, SWAP32(dma->scp.iscp));
+        printk(KERN_DEBUG "iscp at %p, iscp.stat = %08x, .scb = %08x\n",
+               &dma->iscp, SWAP32(dma->iscp.stat), SWAP32(dma->iscp.scb));
+        printk(KERN_DEBUG "scb at %p, scb.status = %04x, .command = %04x,"
+                " .cmd = %08x, .rfd = %08x\n",
+               &dma->scb, SWAP16(dma->scb.status), SWAP16(dma->scb.command),
+                SWAP16(dma->scb.cmd), SWAP32(dma->scb.rfd));
+        printk(KERN_DEBUG "   errors: crc %x, align %x, resource %x,"
+               " over %x, rcvdt %x, short %x\n",
+               SWAP32(dma->scb.crc_err), SWAP32(dma->scb.align_err),
+               SWAP32(dma->scb.resource_err), SWAP32(dma->scb.over_err),
+               SWAP32(dma->scb.rcvdt_err), SWAP32(dma->scb.short_err));
+        cmd = lp->cmd_head;
+        while (cmd != NULL) {
+                printk(KERN_DEBUG
+                       "cmd at %p, .status = %04x, .command = %04x,"
+                       " .b_next = %08x\n",
+                       cmd, SWAP16(cmd->status), SWAP16(cmd->command),
+                       SWAP32(cmd->b_next));
+                cmd = cmd->v_next;
+        }
+        rfd = lp->rfd_head;
+        printk(KERN_DEBUG "rfd_head = %p\n", rfd);
+        do {
+                printk(KERN_DEBUG
+                       "   %p .stat %04x, .cmd %04x, b_next %08x, rbd %08x,"
+                       " count %04x\n",
+                       rfd, SWAP16(rfd->stat), SWAP16(rfd->cmd),
+                       SWAP32(rfd->b_next), SWAP32(rfd->rbd),
+                       SWAP16(rfd->count));
+                rfd = rfd->v_next;
+        } while (rfd != lp->rfd_head);
+        rbd = lp->rbd_head;
+        printk(KERN_DEBUG "rbd_head = %p\n", rbd);
+        do {
+                printk(KERN_DEBUG
+                       "   %p .count %04x, b_next %08x, b_data %08x,"
+                       " size %04x\n",
+                        rbd, SWAP16(rbd->count), SWAP32(rbd->b_next),
+                       SWAP32(rbd->b_data), SWAP16(rbd->size));
+                rbd = rbd->v_next;
+        } while (rbd != lp->rbd_head);
+        DMA_INV(dev, dma, sizeof(struct i596_dma));
+}
+
+
+#define virt_to_dma(lp, v) ((lp)->dma_addr + (dma_addr_t)((unsigned long)(v)-(unsigned long)((lp)->dma)))
+
+static inline int init_rx_bufs(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma = lp->dma;
+        int i;
+        struct i596_rfd *rfd;
+        struct i596_rbd *rbd;
+
+        /* First build the Receive Buffer Descriptor List */
+
+        for (i = 0, rbd = dma->rbds; i < rx_ring_size; i++, rbd++) {
+                dma_addr_t dma_addr;
+                struct sk_buff *skb = netdev_alloc_skb(dev, PKT_BUF_SZ + 4);
+
+                if (skb == NULL)
+                        return -1;
+                skb_reserve(skb, 2);
+                dma_addr = dma_map_single(dev->dev.parent, skb->data,
+                                          PKT_BUF_SZ, DMA_FROM_DEVICE);
+                rbd->v_next = rbd+1;
+                rbd->b_next = SWAP32(virt_to_dma(lp, rbd+1));
+                rbd->b_addr = SWAP32(virt_to_dma(lp, rbd));
+                rbd->skb = skb;
+                rbd->v_data = skb->data;
+                rbd->b_data = SWAP32(dma_addr);
+                rbd->size = SWAP16(PKT_BUF_SZ);
+        }
+        lp->rbd_head = dma->rbds;
+        rbd = dma->rbds + rx_ring_size - 1;
+        rbd->v_next = dma->rbds;
+        rbd->b_next = SWAP32(virt_to_dma(lp, dma->rbds));
+
+        /* Now build the Receive Frame Descriptor List */
+
+        for (i = 0, rfd = dma->rfds; i < rx_ring_size; i++, rfd++) {
+                rfd->rbd = I596_NULL;
+                rfd->v_next = rfd+1;
+                rfd->v_prev = rfd-1;
+                rfd->b_next = SWAP32(virt_to_dma(lp, rfd+1));
+                rfd->cmd = SWAP16(CMD_FLEX);
+        }
+        lp->rfd_head = dma->rfds;
+        dma->scb.rfd = SWAP32(virt_to_dma(lp, dma->rfds));
+        rfd = dma->rfds;
+        rfd->rbd = SWAP32(virt_to_dma(lp, lp->rbd_head));
+        rfd->v_prev = dma->rfds + rx_ring_size - 1;
+        rfd = dma->rfds + rx_ring_size - 1;
+        rfd->v_next = dma->rfds;
+        rfd->b_next = SWAP32(virt_to_dma(lp, dma->rfds));
+        rfd->cmd = SWAP16(CMD_EOL|CMD_FLEX);
+
+        DMA_WBACK_INV(dev, dma, sizeof(struct i596_dma));
+        return 0;
+}
+
+static inline void remove_rx_bufs(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_rbd *rbd;
+        int i;
+
+        for (i = 0, rbd = lp->dma->rbds; i < rx_ring_size; i++, rbd++) {
+                if (rbd->skb == NULL)
+                        break;
+                dma_unmap_single(dev->dev.parent,
+                                 (dma_addr_t)SWAP32(rbd->b_data),
+                                 PKT_BUF_SZ, DMA_FROM_DEVICE);
+                dev_kfree_skb(rbd->skb);
+        }
+}
+
+
+static void rebuild_rx_bufs(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma = lp->dma;
+        int i;
+
+        /* Ensure rx frame/buffer descriptors are tidy */
+
+        for (i = 0; i < rx_ring_size; i++) {
+                dma->rfds[i].rbd = I596_NULL;
+                dma->rfds[i].cmd = SWAP16(CMD_FLEX);
+        }
+        dma->rfds[rx_ring_size-1].cmd = SWAP16(CMD_EOL|CMD_FLEX);
+        lp->rfd_head = dma->rfds;
+        dma->scb.rfd = SWAP32(virt_to_dma(lp, dma->rfds));
+        lp->rbd_head = dma->rbds;
+        dma->rfds[0].rbd = SWAP32(virt_to_dma(lp, dma->rbds));
+
+        DMA_WBACK_INV(dev, dma, sizeof(struct i596_dma));
+}
+
+
+static int init_i596_mem(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma = lp->dma;
+        unsigned long flags;
+
+        mpu_port(dev, PORT_RESET, 0);
+        udelay(100);                    /* Wait 100us - seems to help */
+
+        /* change the scp address */
+
+        lp->last_cmd = jiffies;
+
+        dma->scp.sysbus = SYSBUS;
+        dma->scp.iscp = SWAP32(virt_to_dma(lp, &(dma->iscp)));
+        dma->iscp.scb = SWAP32(virt_to_dma(lp, &(dma->scb)));
+        dma->iscp.stat = SWAP32(ISCP_BUSY);
+        lp->cmd_backlog = 0;
+
+        lp->cmd_head = NULL;
+        dma->scb.cmd = I596_NULL;
+
+        DEB(DEB_INIT, printk(KERN_DEBUG "%s: starting i82596.\n", dev->name));
+
+        DMA_WBACK(dev, &(dma->scp), sizeof(struct i596_scp));
+        DMA_WBACK(dev, &(dma->iscp), sizeof(struct i596_iscp));
+        DMA_WBACK(dev, &(dma->scb), sizeof(struct i596_scb));
+
+        mpu_port(dev, PORT_ALTSCP, virt_to_dma(lp, &dma->scp));
+        ca(dev);
+        if (wait_istat(dev, dma, 1000, "initialization timed out"))
+                goto failed;
+        DEB(DEB_INIT, printk(KERN_DEBUG
+                             "%s: i82596 initialization successful\n",
+                             dev->name));
+
+        if (request_irq(dev->irq, &i596_interrupt, 0, "i82596", dev)) {
+                printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
+                goto failed;
+        }
+
+        /* Ensure rx frame/buffer descriptors are tidy */
+        rebuild_rx_bufs(dev);
+
+        dma->scb.command = 0;
+        DMA_WBACK(dev, &(dma->scb), sizeof(struct i596_scb));
+
+        DEB(DEB_INIT, printk(KERN_DEBUG
+                             "%s: queuing CmdConfigure\n", dev->name));
+        memcpy(dma->cf_cmd.i596_config, init_setup, 14);
+        dma->cf_cmd.cmd.command = SWAP16(CmdConfigure);
+        DMA_WBACK(dev, &(dma->cf_cmd), sizeof(struct cf_cmd));
+        i596_add_cmd(dev, &dma->cf_cmd.cmd);
+
+        DEB(DEB_INIT, printk(KERN_DEBUG "%s: queuing CmdSASetup\n", dev->name));
+        memcpy(dma->sa_cmd.eth_addr, dev->dev_addr, 6);
+        dma->sa_cmd.cmd.command = SWAP16(CmdSASetup);
+        DMA_WBACK(dev, &(dma->sa_cmd), sizeof(struct sa_cmd));
+        i596_add_cmd(dev, &dma->sa_cmd.cmd);
+
+        DEB(DEB_INIT, printk(KERN_DEBUG "%s: queuing CmdTDR\n", dev->name));
+        dma->tdr_cmd.cmd.command = SWAP16(CmdTDR);
+        DMA_WBACK(dev, &(dma->tdr_cmd), sizeof(struct tdr_cmd));
+        i596_add_cmd(dev, &dma->tdr_cmd.cmd);
+
+        spin_lock_irqsave (&lp->lock, flags);
+
+        if (wait_cmd(dev, dma, 1000, "timed out waiting to issue RX_START")) {
+                spin_unlock_irqrestore (&lp->lock, flags);
+                goto failed_free_irq;
+        }
+        DEB(DEB_INIT, printk(KERN_DEBUG "%s: Issuing RX_START\n", dev->name));
+        dma->scb.command = SWAP16(RX_START);
+        dma->scb.rfd = SWAP32(virt_to_dma(lp, dma->rfds));
+        DMA_WBACK(dev, &(dma->scb), sizeof(struct i596_scb));
+
+        ca(dev);
+
+        spin_unlock_irqrestore (&lp->lock, flags);
+        if (wait_cmd(dev, dma, 1000, "RX_START not processed"))
+                goto failed_free_irq;
+        DEB(DEB_INIT, printk(KERN_DEBUG
+                             "%s: Receive unit started OK\n", dev->name));
+        return 0;
+
+failed_free_irq:
+        free_irq(dev->irq, dev);
+failed:
+        printk(KERN_ERR "%s: Failed to initialise 82596\n", dev->name);
+        mpu_port(dev, PORT_RESET, 0);
+        return -1;
+}
+
+
+static inline int i596_rx(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_rfd *rfd;
+        struct i596_rbd *rbd;
+        int frames = 0;
+
+        DEB(DEB_RXFRAME, printk(KERN_DEBUG
+                                "i596_rx(), rfd_head %p, rbd_head %p\n",
+                                lp->rfd_head, lp->rbd_head));
+
+
+        rfd = lp->rfd_head;             /* Ref next frame to check */
+
+        DMA_INV(dev, rfd, sizeof(struct i596_rfd));
+        while (rfd->stat & SWAP16(STAT_C)) {    /* Loop while complete frames */
+                if (rfd->rbd == I596_NULL)
+                        rbd = NULL;
+                else if (rfd->rbd == lp->rbd_head->b_addr) {
+                        rbd = lp->rbd_head;
+                        DMA_INV(dev, rbd, sizeof(struct i596_rbd));
+                } else {
+                        printk(KERN_ERR "%s: rbd chain broken!\n", dev->name);
+                        /* XXX Now what? */
+                        rbd = NULL;
+                }
+                DEB(DEB_RXFRAME, printk(KERN_DEBUG
+                                      "  rfd %p, rfd.rbd %08x, rfd.stat %04x\n",
+                                      rfd, rfd->rbd, rfd->stat));
+
+                if (rbd != NULL && (rfd->stat & SWAP16(STAT_OK))) {
+                        /* a good frame */
+                        int pkt_len = SWAP16(rbd->count) & 0x3fff;
+                        struct sk_buff *skb = rbd->skb;
+                        int rx_in_place = 0;
+
+                        DEB(DEB_RXADDR, print_eth(rbd->v_data, "received"));
+                        frames++;
+
+                        /* Check if the packet is long enough to just accept
+                         * without copying to a properly sized skbuff.
+                         */
+
+                        if (pkt_len > rx_copybreak) {
+                                struct sk_buff *newskb;
+                                dma_addr_t dma_addr;
+
+                                dma_unmap_single(dev->dev.parent,
+                                                 (dma_addr_t)SWAP32(rbd->b_data),
+                                                 PKT_BUF_SZ, DMA_FROM_DEVICE);
+                                /* Get fresh skbuff to replace filled one. */
+                                newskb = netdev_alloc_skb(dev, PKT_BUF_SZ + 4);
+                                if (newskb == NULL) {
+                                        skb = NULL;     /* drop pkt */
+                                        goto memory_squeeze;
+                                }
+                                skb_reserve(newskb, 2);
+
+                                /* Pass up the skb already on the Rx ring. */
+                                skb_put(skb, pkt_len);
+                                rx_in_place = 1;
+                                rbd->skb = newskb;
+                                dma_addr = dma_map_single(dev->dev.parent,
+                                                          newskb->data,
+                                                          PKT_BUF_SZ,
+                                                          DMA_FROM_DEVICE);
+                                rbd->v_data = newskb->data;
+                                rbd->b_data = SWAP32(dma_addr);
+                                DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
+                        } else
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
+memory_squeeze:
+                        if (skb == NULL) {
+                                /* XXX tulip.c can defer packets here!! */
+                                printk(KERN_ERR
+                                       "%s: i596_rx Memory squeeze, dropping packet.\n",
+                                       dev->name);
+                                lp->stats.rx_dropped++;
+                        } else {
+                                if (!rx_in_place) {
+                                        /* 16 byte align the data fields */
+                                        dma_sync_single_for_cpu(dev->dev.parent,
+                                                                (dma_addr_t)SWAP32(rbd->b_data),
+                                                                PKT_BUF_SZ, DMA_FROM_DEVICE);
+                                        skb_reserve(skb, 2);
+                                        memcpy(skb_put(skb, pkt_len), rbd->v_data, pkt_len);
+                                        dma_sync_single_for_device(dev->dev.parent,
+                                                                   (dma_addr_t)SWAP32(rbd->b_data),
+                                                                   PKT_BUF_SZ, DMA_FROM_DEVICE);
+                                }
+                                skb->len = pkt_len;
+                                skb->protocol = eth_type_trans(skb, dev);
+                                netif_rx(skb);
+                                dev->last_rx = jiffies;
+                                lp->stats.rx_packets++;
+                                lp->stats.rx_bytes += pkt_len;
+                        }
+                } else {
+                        DEB(DEB_ERRORS, printk(KERN_DEBUG
+                                               "%s: Error, rfd.stat = 0x%04x\n",
+                                               dev->name, rfd->stat));
+                        lp->stats.rx_errors++;
+                        if (rfd->stat & SWAP16(0x0100))
+                                lp->stats.collisions++;
+                        if (rfd->stat & SWAP16(0x8000))
+                                lp->stats.rx_length_errors++;
+                        if (rfd->stat & SWAP16(0x0001))
+                                lp->stats.rx_over_errors++;
+                        if (rfd->stat & SWAP16(0x0002))
+                                lp->stats.rx_fifo_errors++;
+                        if (rfd->stat & SWAP16(0x0004))
+                                lp->stats.rx_frame_errors++;
+                        if (rfd->stat & SWAP16(0x0008))
+                                lp->stats.rx_crc_errors++;
+                        if (rfd->stat & SWAP16(0x0010))
+                                lp->stats.rx_length_errors++;
+                }
+
+                /* Clear the buffer descriptor count and EOF + F flags */
+
+                if (rbd != NULL && (rbd->count & SWAP16(0x4000))) {
+                        rbd->count = 0;
+                        lp->rbd_head = rbd->v_next;
+                        DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
+                }
+
+                /* Tidy the frame descriptor, marking it as end of list */
+
+                rfd->rbd = I596_NULL;
+                rfd->stat = 0;
+                rfd->cmd = SWAP16(CMD_EOL|CMD_FLEX);
+                rfd->count = 0;
+
+                /* Update record of next frame descriptor to process */
+
+                lp->dma->scb.rfd = rfd->b_next;
+                lp->rfd_head = rfd->v_next;
+                DMA_WBACK_INV(dev, rfd, sizeof(struct i596_rfd));
+
+                /* Remove end-of-list from old end descriptor */
+
+                rfd->v_prev->cmd = SWAP16(CMD_FLEX);
+                DMA_WBACK_INV(dev, rfd->v_prev, sizeof(struct i596_rfd));
+                rfd = lp->rfd_head;
+                DMA_INV(dev, rfd, sizeof(struct i596_rfd));
+        }
+
+        DEB(DEB_RXFRAME, printk(KERN_DEBUG "frames %d\n", frames));
+
+        return 0;
+}
+
+
+static inline void i596_cleanup_cmd(struct net_device *dev, struct i596_private *lp)
+{
+        struct i596_cmd *ptr;
+
+        while (lp->cmd_head != NULL) {
+                ptr = lp->cmd_head;
+                lp->cmd_head = ptr->v_next;
+                lp->cmd_backlog--;
+
+                switch (SWAP16(ptr->command) & 0x7) {
+                case CmdTx:
+                        {
+                                struct tx_cmd *tx_cmd = (struct tx_cmd *) ptr;
+                                struct sk_buff *skb = tx_cmd->skb;
+                                dma_unmap_single(dev->dev.parent,
+                                                 tx_cmd->dma_addr,
+                                                 skb->len, DMA_TO_DEVICE);
+
+                                dev_kfree_skb(skb);
+
+                                lp->stats.tx_errors++;
+                                lp->stats.tx_aborted_errors++;
+
+                                ptr->v_next = NULL;
+                                ptr->b_next = I596_NULL;
+                                tx_cmd->cmd.command = 0;  /* Mark as free */
+                                break;
+                        }
+                default:
+                        ptr->v_next = NULL;
+                        ptr->b_next = I596_NULL;
+                }
+                DMA_WBACK_INV(dev, ptr, sizeof(struct i596_cmd));
+        }
+
+        wait_cmd(dev, lp->dma, 100, "i596_cleanup_cmd timed out");
+        lp->dma->scb.cmd = I596_NULL;
+        DMA_WBACK(dev, &(lp->dma->scb), sizeof(struct i596_scb));
+}
+
+
+static inline void i596_reset(struct net_device *dev, struct i596_private *lp)
+{
+        unsigned long flags;
+
+        DEB(DEB_RESET, printk(KERN_DEBUG "i596_reset\n"));
+
+        spin_lock_irqsave (&lp->lock, flags);
+
+        wait_cmd(dev, lp->dma, 100, "i596_reset timed out");
+
+        netif_stop_queue(dev);
+
+        /* FIXME: this command might cause an lpmc */
+        lp->dma->scb.command = SWAP16(CUC_ABORT | RX_ABORT);
+        DMA_WBACK(dev, &(lp->dma->scb), sizeof(struct i596_scb));
+        ca(dev);
+
+        /* wait for shutdown */
+        wait_cmd(dev, lp->dma, 1000, "i596_reset 2 timed out");
+        spin_unlock_irqrestore (&lp->lock, flags);
+
+        i596_cleanup_cmd(dev, lp);
+        i596_rx(dev);
+
+        netif_start_queue(dev);
+        init_i596_mem(dev);
+}
+
+
+static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma = lp->dma;
+        unsigned long flags;
+
+        DEB(DEB_ADDCMD, printk(KERN_DEBUG "i596_add_cmd cmd_head %p\n",
+                               lp->cmd_head));
+
+        cmd->status = 0;
+        cmd->command |= SWAP16(CMD_EOL | CMD_INTR);
+        cmd->v_next = NULL;
+        cmd->b_next = I596_NULL;
+        DMA_WBACK(dev, cmd, sizeof(struct i596_cmd));
+
+        spin_lock_irqsave (&lp->lock, flags);
+
+        if (lp->cmd_head != NULL) {
+                lp->cmd_tail->v_next = cmd;
+                lp->cmd_tail->b_next = SWAP32(virt_to_dma(lp, &cmd->status));
+                DMA_WBACK(dev, lp->cmd_tail, sizeof(struct i596_cmd));
+        } else {
+                lp->cmd_head = cmd;
+                wait_cmd(dev, dma, 100, "i596_add_cmd timed out");
+                dma->scb.cmd = SWAP32(virt_to_dma(lp, &cmd->status));
+                dma->scb.command = SWAP16(CUC_START);
+                DMA_WBACK(dev, &(dma->scb), sizeof(struct i596_scb));
+                ca(dev);
+        }
+        lp->cmd_tail = cmd;
+        lp->cmd_backlog++;
+
+        spin_unlock_irqrestore (&lp->lock, flags);
+
+        if (lp->cmd_backlog > max_cmd_backlog) {
+                unsigned long tickssofar = jiffies - lp->last_cmd;
+
+                if (tickssofar < ticks_limit)
+                        return;
+
+                printk(KERN_ERR
+                       "%s: command unit timed out, status resetting.\n",
+                       dev->name);
+#if 1
+                i596_reset(dev, lp);
+#endif
+        }
+}
+
+static int i596_open(struct net_device *dev)
+{
+        DEB(DEB_OPEN, printk(KERN_DEBUG
+                             "%s: i596_open() irq %d.\n", dev->name, dev->irq));
+
+        if (init_rx_bufs(dev)) {
+                printk(KERN_ERR "%s: Failed to init rx bufs\n", dev->name);
+                return -EAGAIN;
+        }
+        if (init_i596_mem(dev)) {
+                printk(KERN_ERR "%s: Failed to init memory\n", dev->name);
+                goto out_remove_rx_bufs;
+        }
+        netif_start_queue(dev);
+
+        return 0;
+
+out_remove_rx_bufs:
+        remove_rx_bufs(dev);
+        return -EAGAIN;
+}
+
+static void i596_tx_timeout (struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+
+        /* Transmitter timeout, serious problems. */
+        DEB(DEB_ERRORS, printk(KERN_DEBUG
+                               "%s: transmit timed out, status resetting.\n",
+                               dev->name));
+
+        lp->stats.tx_errors++;
+
+        /* Try to restart the adaptor */
+        if (lp->last_restart == lp->stats.tx_packets) {
+                DEB(DEB_ERRORS, printk(KERN_DEBUG "Resetting board.\n"));
+                /* Shutdown and restart */
+                i596_reset (dev, lp);
+        } else {
+                /* Issue a channel attention signal */
+                DEB(DEB_ERRORS, printk(KERN_DEBUG "Kicking board.\n"));
+                lp->dma->scb.command = SWAP16(CUC_START | RX_START);
+                DMA_WBACK_INV(dev, &(lp->dma->scb), sizeof(struct i596_scb));
+                ca (dev);
+                lp->last_restart = lp->stats.tx_packets;
+        }
+
+        dev->trans_start = jiffies;
+        netif_wake_queue (dev);
+}
+
+
+static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct tx_cmd *tx_cmd;
+        struct i596_tbd *tbd;
+        short length = skb->len;
+        dev->trans_start = jiffies;
+
+        DEB(DEB_STARTTX, printk(KERN_DEBUG
+                                "%s: i596_start_xmit(%x,%p) called\n",
+                                dev->name, skb->len, skb->data));
+
+        if (length < ETH_ZLEN) {
+                if (skb_padto(skb, ETH_ZLEN))
+                        return 0;
+                length = ETH_ZLEN;
+        }
+
+        netif_stop_queue(dev);
+
+        tx_cmd = lp->dma->tx_cmds + lp->next_tx_cmd;
+        tbd = lp->dma->tbds + lp->next_tx_cmd;
+
+        if (tx_cmd->cmd.command) {
+                DEB(DEB_ERRORS, printk(KERN_DEBUG
+                                       "%s: xmit ring full, dropping packet.\n",
+                                       dev->name));
+                lp->stats.tx_dropped++;
+
+                dev_kfree_skb(skb);
+        } else {
+                if (++lp->next_tx_cmd == TX_RING_SIZE)
+                        lp->next_tx_cmd = 0;
+                tx_cmd->tbd = SWAP32(virt_to_dma(lp, tbd));
+                tbd->next = I596_NULL;
+
+                tx_cmd->cmd.command = SWAP16(CMD_FLEX | CmdTx);
+                tx_cmd->skb = skb;
+
+                tx_cmd->pad = 0;
+                tx_cmd->size = 0;
+                tbd->pad = 0;
+                tbd->size = SWAP16(EOF | length);
+
+                tx_cmd->dma_addr = dma_map_single(dev->dev.parent, skb->data,
+                                                  skb->len, DMA_TO_DEVICE);
+                tbd->data = SWAP32(tx_cmd->dma_addr);
+
+                DEB(DEB_TXADDR, print_eth(skb->data, "tx-queued"));
+                DMA_WBACK_INV(dev, tx_cmd, sizeof(struct tx_cmd));
+                DMA_WBACK_INV(dev, tbd, sizeof(struct i596_tbd));
+                i596_add_cmd(dev, &tx_cmd->cmd);
+
+                lp->stats.tx_packets++;
+                lp->stats.tx_bytes += length;
+        }
+
+        netif_start_queue(dev);
+
+        return 0;
+}
+
+static void print_eth(unsigned char *add, char *str)
+{
+        int i;
+
+        printk(KERN_DEBUG "i596 0x%p, ", add);
+        for (i = 0; i < 6; i++)
+                printk(" %02X", add[i + 6]);
+        printk(" -->");
+        for (i = 0; i < 6; i++)
+                printk(" %02X", add[i]);
+        printk(" %02X%02X, %s\n", add[12], add[13], str);
+}
+
+static int __devinit i82596_probe(struct net_device *dev)
+{
+        int i;
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma;
+
+        /* This lot is ensure things have been cache line aligned. */
+        BUILD_BUG_ON(sizeof(struct i596_rfd) != 32);
+        BUILD_BUG_ON(sizeof(struct i596_rbd) &  31);
+        BUILD_BUG_ON(sizeof(struct tx_cmd)   &  31);
+        BUILD_BUG_ON(sizeof(struct i596_tbd) != 32);
+#ifndef __LP64__
+        BUILD_BUG_ON(sizeof(struct i596_dma) > 4096);
+#endif
+
+        if (!dev->base_addr || !dev->irq)
+                return -ENODEV;
+
+        dma = (struct i596_dma *) DMA_ALLOC(dev->dev.parent,
+                sizeof(struct i596_dma), &lp->dma_addr, GFP_KERNEL);
+        if (!dma) {
+                printk(KERN_ERR "%s: Couldn't get shared memory\n", __FILE__);
+                return -ENOMEM;
+        }
+
+        /* The 82596-specific entries in the device structure. */
+        dev->open = i596_open;
+        dev->stop = i596_close;
+        dev->hard_start_xmit = i596_start_xmit;
+        dev->get_stats = i596_get_stats;
+        dev->set_multicast_list = set_multicast_list;
+        dev->tx_timeout = i596_tx_timeout;
+        dev->watchdog_timeo = TX_TIMEOUT;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = i596_poll_controller;
+#endif
+
+        memset(dma, 0, sizeof(struct i596_dma));
+        lp->dma = dma;
+
+        dma->scb.command = 0;
+        dma->scb.cmd = I596_NULL;
+        dma->scb.rfd = I596_NULL;
+        spin_lock_init(&lp->lock);
+
+        DMA_WBACK_INV(dev, dma, sizeof(struct i596_dma));
+
+        i = register_netdev(dev);
+        if (i) {
+                DMA_FREE(dev->dev.parent, sizeof(struct i596_dma),
+                                    (void *)dma, lp->dma_addr);
+                return i;
+        };
+
+        DEB(DEB_PROBE, printk(KERN_INFO "%s: 82596 at %#3lx,",
+                              dev->name, dev->base_addr));
+        for (i = 0; i < 6; i++)
+                DEB(DEB_PROBE, printk(" %2.2X", dev->dev_addr[i]));
+        DEB(DEB_PROBE, printk(" IRQ %d.\n", dev->irq));
+        DEB(DEB_INIT, printk(KERN_INFO
+                             "%s: dma at 0x%p (%d bytes), lp->scb at 0x%p\n",
+                             dev->name, dma, (int)sizeof(struct i596_dma),
+                             &dma->scb));
+
+        return 0;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void i596_poll_controller(struct net_device *dev)
+{
+        disable_irq(dev->irq);
+        i596_interrupt(dev->irq, dev);
+        enable_irq(dev->irq);
+}
+#endif
+
+static irqreturn_t i596_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct i596_private *lp;
+        struct i596_dma *dma;
+        unsigned short status, ack_cmd = 0;
+
+        if (dev == NULL) {
+                printk(KERN_WARNING "%s: irq %d for unknown device.\n",
+                       __FUNCTION__, irq);
+                return IRQ_NONE;
+        }
+
+        lp = netdev_priv(dev);
+        dma = lp->dma;
+
+        spin_lock (&lp->lock);
+
+        wait_cmd(dev, dma, 100, "i596 interrupt, timeout");
+        status = SWAP16(dma->scb.status);
+
+        DEB(DEB_INTS, printk(KERN_DEBUG
+                             "%s: i596 interrupt, IRQ %d, status %4.4x.\n",
+                        dev->name, irq, status));
+
+        ack_cmd = status & 0xf000;
+
+        if (!ack_cmd) {
+                DEB(DEB_ERRORS, printk(KERN_DEBUG
+                                       "%s: interrupt with no events\n",
+                                       dev->name));
+                spin_unlock (&lp->lock);
+                return IRQ_NONE;
+        }
+
+        if ((status & 0x8000) || (status & 0x2000)) {
+                struct i596_cmd *ptr;
+
+                if ((status & 0x8000))
+                        DEB(DEB_INTS,
+                            printk(KERN_DEBUG
+                                   "%s: i596 interrupt completed command.\n",
+                                   dev->name));
+                if ((status & 0x2000))
+                        DEB(DEB_INTS,
+                            printk(KERN_DEBUG
+                                   "%s: i596 interrupt command unit inactive %x.\n",
+                                   dev->name, status & 0x0700));
+
+                while (lp->cmd_head != NULL) {
+                        DMA_INV(dev, lp->cmd_head, sizeof(struct i596_cmd));
+                        if (!(lp->cmd_head->status & SWAP16(STAT_C)))
+                                break;
+
+                        ptr = lp->cmd_head;
+
+                        DEB(DEB_STATUS,
+                            printk(KERN_DEBUG
+                                   "cmd_head->status = %04x, ->command = %04x\n",
+                                   SWAP16(lp->cmd_head->status),
+                                   SWAP16(lp->cmd_head->command)));
+                        lp->cmd_head = ptr->v_next;
+                        lp->cmd_backlog--;
+
+                        switch (SWAP16(ptr->command) & 0x7) {
+                        case CmdTx:
+                            {
+                                struct tx_cmd *tx_cmd = (struct tx_cmd *) ptr;
+                                struct sk_buff *skb = tx_cmd->skb;
+
+                                if (ptr->status & SWAP16(STAT_OK)) {
+                                        DEB(DEB_TXADDR,
+                                            print_eth(skb->data, "tx-done"));
+                                } else {
+                                        lp->stats.tx_errors++;
+                                        if (ptr->status & SWAP16(0x0020))
+                                                lp->stats.collisions++;
+                                        if (!(ptr->status & SWAP16(0x0040)))
+                                                lp->stats.tx_heartbeat_errors++;
+                                        if (ptr->status & SWAP16(0x0400))
+                                                lp->stats.tx_carrier_errors++;
+                                        if (ptr->status & SWAP16(0x0800))
+                                                lp->stats.collisions++;
+                                        if (ptr->status & SWAP16(0x1000))
+                                                lp->stats.tx_aborted_errors++;
+                                }
+                                dma_unmap_single(dev->dev.parent,
+                                                 tx_cmd->dma_addr,
+                                                 skb->len, DMA_TO_DEVICE);
+                                dev_kfree_skb_irq(skb);
+
+                                tx_cmd->cmd.command = 0; /* Mark free */
+                                break;
+                            }
+                        case CmdTDR:
+                            {
+                                unsigned short status = SWAP16(((struct tdr_cmd *)ptr)->status);
+
+                                if (status & 0x8000) {
+                                        DEB(DEB_ANY,
+                                            printk(KERN_DEBUG "%s: link ok.\n",
+                                                   dev->name));
+                                } else {
+                                        if (status & 0x4000)
+                                                printk(KERN_ERR
+                                                       "%s: Transceiver problem.\n",
+                                                       dev->name);
+                                        if (status & 0x2000)
+                                                printk(KERN_ERR
+                                                       "%s: Termination problem.\n",
+                                                       dev->name);
+                                        if (status & 0x1000)
+                                                printk(KERN_ERR
+                                                       "%s: Short circuit.\n",
+                                                       dev->name);
+
+                                        DEB(DEB_TDR,
+                                            printk(KERN_DEBUG "%s: Time %d.\n",
+                                                   dev->name, status & 0x07ff));
+                                }
+                                break;
+                            }
+                        case CmdConfigure:
+                                /*
+                                 * Zap command so set_multicast_list() know
+                                 * it is free
+                                 */
+                                ptr->command = 0;
+                                break;
+                        }
+                        ptr->v_next = NULL;
+                        ptr->b_next = I596_NULL;
+                        DMA_WBACK(dev, ptr, sizeof(struct i596_cmd));
+                        lp->last_cmd = jiffies;
+                }
+
+                /* This mess is arranging that only the last of any outstanding
+                 * commands has the interrupt bit set.  Should probably really
+                 * only add to the cmd queue when the CU is stopped.
+                 */
+                ptr = lp->cmd_head;
+                while ((ptr != NULL) && (ptr != lp->cmd_tail)) {
+                        struct i596_cmd *prev = ptr;
+
+                        ptr->command &= SWAP16(0x1fff);
+                        ptr = ptr->v_next;
+                        DMA_WBACK_INV(dev, prev, sizeof(struct i596_cmd));
+                }
+
+                if (lp->cmd_head != NULL)
+                        ack_cmd |= CUC_START;
+                dma->scb.cmd = SWAP32(virt_to_dma(lp, &lp->cmd_head->status));
+                DMA_WBACK_INV(dev, &dma->scb, sizeof(struct i596_scb));
+        }
+        if ((status & 0x1000) || (status & 0x4000)) {
+                if ((status & 0x4000))
+                        DEB(DEB_INTS,
+                            printk(KERN_DEBUG
+                                   "%s: i596 interrupt received a frame.\n",
+                                   dev->name));
+                i596_rx(dev);
+                /* Only RX_START if stopped - RGH 07-07-96 */
+                if (status & 0x1000) {
+                        if (netif_running(dev)) {
+                                DEB(DEB_ERRORS,
+                                    printk(KERN_DEBUG
+                                           "%s: i596 interrupt receive unit inactive, status 0x%x\n",
+                                           dev->name, status));
+                                ack_cmd |= RX_START;
+                                lp->stats.rx_errors++;
+                                lp->stats.rx_fifo_errors++;
+                                rebuild_rx_bufs(dev);
+                        }
+                }
+        }
+        wait_cmd(dev, dma, 100, "i596 interrupt, timeout");
+        dma->scb.command = SWAP16(ack_cmd);
+        DMA_WBACK(dev, &dma->scb, sizeof(struct i596_scb));
+
+        /* DANGER: I suspect that some kind of interrupt
+         acknowledgement aside from acking the 82596 might be needed
+         here...  but it's running acceptably without */
+
+        ca(dev);
+
+        wait_cmd(dev, dma, 100, "i596 interrupt, exit timeout");
+        DEB(DEB_INTS, printk(KERN_DEBUG "%s: exiting interrupt.\n", dev->name));
+
+        spin_unlock (&lp->lock);
+        return IRQ_HANDLED;
+}
+
+static int i596_close(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        unsigned long flags;
+
+        netif_stop_queue(dev);
+
+        DEB(DEB_INIT,
+            printk(KERN_DEBUG
+                   "%s: Shutting down ethercard, status was %4.4x.\n",
+                   dev->name, SWAP16(lp->dma->scb.status)));
+
+        spin_lock_irqsave(&lp->lock, flags);
+
+        wait_cmd(dev, lp->dma, 100, "close1 timed out");
+        lp->dma->scb.command = SWAP16(CUC_ABORT | RX_ABORT);
+        DMA_WBACK(dev, &lp->dma->scb, sizeof(struct i596_scb));
+
+        ca(dev);
+
+        wait_cmd(dev, lp->dma, 100, "close2 timed out");
+        spin_unlock_irqrestore(&lp->lock, flags);
+        DEB(DEB_STRUCT, i596_display_data(dev));
+        i596_cleanup_cmd(dev, lp);
+
+        free_irq(dev->irq, dev);
+        remove_rx_bufs(dev);
+
+        return 0;
+}
+
+static struct net_device_stats *i596_get_stats(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+
+        return &lp->stats;
+}
+
+/*
+ *    Set or clear the multicast filter for this adaptor.
+ */
+
+static void set_multicast_list(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+        struct i596_dma *dma = lp->dma;
+        int config = 0, cnt;
+
+        DEB(DEB_MULTI,
+            printk(KERN_DEBUG
+                   "%s: set multicast list, %d entries, promisc %s, allmulti %s\n",
+                   dev->name, dev->mc_count,
+                   dev->flags & IFF_PROMISC ? "ON" : "OFF",
+                   dev->flags & IFF_ALLMULTI ? "ON" : "OFF"));
+
+        if ((dev->flags & IFF_PROMISC) &&
+            !(dma->cf_cmd.i596_config[8] & 0x01)) {
+                dma->cf_cmd.i596_config[8] |= 0x01;
+                config = 1;
+        }
+        if (!(dev->flags & IFF_PROMISC) &&
+            (dma->cf_cmd.i596_config[8] & 0x01)) {
+                dma->cf_cmd.i596_config[8] &= ~0x01;
+                config = 1;
+        }
+        if ((dev->flags & IFF_ALLMULTI) &&
+            (dma->cf_cmd.i596_config[11] & 0x20)) {
+                dma->cf_cmd.i596_config[11] &= ~0x20;
+                config = 1;
+        }
+        if (!(dev->flags & IFF_ALLMULTI) &&
+            !(dma->cf_cmd.i596_config[11] & 0x20)) {
+                dma->cf_cmd.i596_config[11] |= 0x20;
+                config = 1;
+        }
+        if (config) {
+                if (dma->cf_cmd.cmd.command)
+                        printk(KERN_INFO
+                               "%s: config change request already queued\n",
+                               dev->name);
+                else {
+                        dma->cf_cmd.cmd.command = SWAP16(CmdConfigure);
+                        DMA_WBACK_INV(dev, &dma->cf_cmd, sizeof(struct cf_cmd));
+                        i596_add_cmd(dev, &dma->cf_cmd.cmd);
+                }
+        }
+
+        cnt = dev->mc_count;
+        if (cnt > MAX_MC_CNT) {
+                cnt = MAX_MC_CNT;
+                printk(KERN_NOTICE "%s: Only %d multicast addresses supported",
+                        dev->name, cnt);
+        }
+
+        if (dev->mc_count > 0) {
+                struct dev_mc_list *dmi;
+                unsigned char *cp;
+                struct mc_cmd *cmd;
+
+                cmd = &dma->mc_cmd;
+                cmd->cmd.command = SWAP16(CmdMulticastList);
+                cmd->mc_cnt = SWAP16(dev->mc_count * 6);
+                cp = cmd->mc_addrs;
+                for (dmi = dev->mc_list;
+                     cnt && dmi != NULL;
+                     dmi = dmi->next, cnt--, cp += 6) {
+                        memcpy(cp, dmi->dmi_addr, 6);
+                        if (i596_debug > 1)
+                                DEB(DEB_MULTI,
+                                    printk(KERN_DEBUG
+                                           "%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
+                                           dev->name, cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]));
+                }
+                DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
+                i596_add_cmd(dev, &cmd->cmd);
+        }
+}
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/mlx4/qp.c
index 7f8b7d55b6e1..492cfaaaa75c 100644
--- a/drivers/net/mlx4/qp.c
+++ b/drivers/net/mlx4/qp.c
@@ -113,8 +113,7 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
         struct mlx4_cmd_mailbox *mailbox;
         int ret = 0;
 
-        if (cur_state < 0 || cur_state >= MLX4_QP_NUM_STATE ||
-            new_state < 0 || cur_state >= MLX4_QP_NUM_STATE ||
+        if (cur_state >= MLX4_QP_NUM_STATE || cur_state >= MLX4_QP_NUM_STATE ||
             !op[cur_state][new_state])
                 return -EINVAL;
 
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 75102d30730f..05e0577a0e10 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -724,7 +724,7 @@ int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter)
         __u32 mac_cfg0;
         u32 port = physical_port[adapter->portnum];
 
-        if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+        if (port > NETXEN_NIU_MAX_GBE_PORTS)
                 return -EINVAL;
         mac_cfg0 = 0;
         netxen_gb_soft_reset(mac_cfg0);
@@ -757,7 +757,7 @@ int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter,
         __u32 reg;
         u32 port = physical_port[adapter->portnum];
 
-        if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+        if (port > NETXEN_NIU_MAX_GBE_PORTS)
                 return -EINVAL;
 
         /* save previous contents */
@@ -894,7 +894,7 @@ int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,
         __u32 reg;
         u32 port = physical_port[adapter->portnum];
 
-        if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
+        if (port > NETXEN_NIU_MAX_XG_PORTS)
                 return -EINVAL;
 
         if (netxen_nic_hw_read_wx(adapter,
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 8d38425e46c3..0b3066a6fe40 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -755,7 +755,7 @@ static int pasemi_mac_open(struct net_device *dev)
         flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G;
 
         pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch),
-                               PAS_IOB_DMA_RXCH_CFG_CNTTH(1));
+                               PAS_IOB_DMA_RXCH_CFG_CNTTH(0));
 
         pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_TXCH_CFG(mac->dma_txch),
                                PAS_IOB_DMA_TXCH_CFG_CNTTH(32));
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 808fae1577e0..50dff1b81d34 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -521,6 +521,7 @@ static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value)
 
 static int axnet_open(struct net_device *dev)
 {
+    int ret;
     axnet_dev_t *info = PRIV(dev);
     struct pcmcia_device *link = info->p_dev;
     
@@ -529,9 +530,11 @@ static int axnet_open(struct net_device *dev)
     if (!pcmcia_dev_present(link))
         return -ENODEV;
 
-    link->open++;
+    ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev);
+    if (ret)
+            return ret;
 
-    request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev);
+    link->open++;
 
     info->link_status = 0x00;
     init_timer(&info->watchdog);
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 3f93d4933235..85d5f2ca4bb5 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -109,7 +109,7 @@ static const struct ethtool_ops netdev_ethtool_ops;
     card type
  */
 typedef enum { MBH10302, MBH10304, TDK, CONTEC, LA501, UNGERMANN, 
-               XXX10304
+               XXX10304, NEC, KME
 } cardtype_t;
 
 /*
@@ -374,6 +374,18 @@ static int fmvj18x_config(struct pcmcia_device *link)
                 link->io.NumPorts2 = 8;
             }
             break;
+        case MANFID_NEC:
+            cardtype = NEC; /* MultiFunction Card */
+            link->conf.ConfigBase = 0x800;
+            link->conf.ConfigIndex = 0x47;
+            link->io.NumPorts2 = 8;
+            break;
+        case MANFID_KME:
+            cardtype = KME; /* MultiFunction Card */
+            link->conf.ConfigBase = 0x800;
+            link->conf.ConfigIndex = 0x47;
+            link->io.NumPorts2 = 8;
+            break;
         case MANFID_CONTEC:
             cardtype = CONTEC;
             break;
@@ -450,6 +462,8 @@ static int fmvj18x_config(struct pcmcia_device *link)
     case TDK:
     case LA501:
     case CONTEC:
+    case NEC:
+    case KME:
         tuple.DesiredTuple = CISTPL_FUNCE;
         tuple.TupleOffset = 0;
         CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
@@ -469,6 +483,10 @@ static int fmvj18x_config(struct pcmcia_device *link)
                 card_name = "TDK LAK-CD021";
             } else if( cardtype == LA501 ) {
                 card_name = "LA501";
+            } else if( cardtype == NEC ) {
+                card_name = "PK-UG-J001";
+            } else if( cardtype == KME ) {
+                card_name = "Panasonic";
             } else {
                 card_name = "C-NET(PC)C";
             }
@@ -678,8 +696,11 @@ static struct pcmcia_device_id fmvj18x_ids[] = {
         PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da),
         PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080),
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
+        PCMCIA_PFC_DEVICE_PROD_ID12(0, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),
+        PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05),
+        PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101),
         PCMCIA_DEVICE_NULL,
 };
 MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids);
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index d88e9b2e93cf..f2613c29b008 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -960,6 +960,7 @@ static void mii_phy_probe(struct net_device *dev)
 
 static int pcnet_open(struct net_device *dev)
 {
+    int ret;
     pcnet_dev_t *info = PRIV(dev);
     struct pcmcia_device *link = info->p_dev;
 
@@ -968,10 +969,12 @@ static int pcnet_open(struct net_device *dev)
     if (!pcmcia_dev_present(link))
         return -ENODEV;
 
-    link->open++;
-
     set_misc_reg(dev);
-    request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);
+    ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);
+    if (ret)
+            return ret;
+
+    link->open++;
 
     info->phy_id = info->eth_phy;
     info->link_status = 0x00;
@@ -1552,6 +1555,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "Grey Cell", "GCS3000", 0x2a151fac, 0x48b932ae),
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
+        PCMCIA_PFC_DEVICE_PROD_ID12(0, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
         PCMCIA_MFC_DEVICE_PROD_ID12(0, "IBM", "Home and Away 28.8 PC Card       ", 0xb569a6e5, 0x5bd4ff2c),
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 09b6f259eb92..dd09011c7ee5 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -55,6 +55,11 @@ config BROADCOM_PHY
         ---help---
           Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
 
+config ICPLUS_PHY
+        tristate "Drivers for ICPlus PHYs"
+        ---help---
+          Currently supports the IP175C PHY.
+
 config FIXED_PHY
         tristate "Drivers for PHY emulation on fixed speed/link"
         ---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index bcd1efbd2a18..8885650647ff 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -11,4 +11,5 @@ obj-$(CONFIG_QSEMI_PHY)		+= qsemi.o
 obj-$(CONFIG_SMSC_PHY)          += smsc.o
 obj-$(CONFIG_VITESSE_PHY)       += vitesse.o
 obj-$(CONFIG_BROADCOM_PHY)      += broadcom.o
+obj-$(CONFIG_ICPLUS_PHY)        += icplus.o
 obj-$(CONFIG_FIXED_PHY)         += fixed.o
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
new file mode 100644
index 000000000000..af3f1f2a9f87
--- /dev/null
+++ b/drivers/net/phy/icplus.c
@@ -0,0 +1,134 @@
+/*
+ * Driver for ICPlus PHYs
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+
+MODULE_DESCRIPTION("ICPlus IP175C PHY driver");
+MODULE_AUTHOR("Michael Barkowski");
+MODULE_LICENSE("GPL");
+
+static int ip175c_config_init(struct phy_device *phydev)
+{
+        int err, i;
+        static int full_reset_performed = 0;
+
+        if (full_reset_performed == 0) {
+
+                /* master reset */
+                err = phydev->bus->write(phydev->bus, 30, 0, 0x175c);
+                if (err < 0)
+                        return err;
+
+                /* ensure no bus delays overlap reset period */
+                err = phydev->bus->read(phydev->bus, 30, 0);
+
+                /* data sheet specifies reset period is 2 msec */
+                mdelay(2);
+
+                /* enable IP175C mode */
+                err = phydev->bus->write(phydev->bus, 29, 31, 0x175c);
+                if (err < 0)
+                        return err;
+
+                /* Set MII0 speed and duplex (in PHY mode) */
+                err = phydev->bus->write(phydev->bus, 29, 22, 0x420);
+                if (err < 0)
+                        return err;
+
+                /* reset switch ports */
+                for (i = 0; i < 5; i++) {
+                        err = phydev->bus->write(phydev->bus, i,
+                                                 MII_BMCR, BMCR_RESET);
+                        if (err < 0)
+                                return err;
+                }
+
+                for (i = 0; i < 5; i++)
+                        err = phydev->bus->read(phydev->bus, i, MII_BMCR);
+
+                mdelay(2);
+
+                full_reset_performed = 1;
+        }
+
+        if (phydev->addr != 4) {
+                phydev->state = PHY_RUNNING;
+                phydev->speed = SPEED_100;
+                phydev->duplex = DUPLEX_FULL;
+                phydev->link = 1;
+                netif_carrier_on(phydev->attached_dev);
+        }
+
+        return 0;
+}
+
+static int ip175c_read_status(struct phy_device *phydev)
+{
+        if (phydev->addr == 4) /* WAN port */
+                genphy_read_status(phydev);
+        else
+                /* Don't need to read status for switch ports */
+                phydev->irq = PHY_IGNORE_INTERRUPT;
+
+        return 0;
+}
+
+static int ip175c_config_aneg(struct phy_device *phydev)
+{
+        if (phydev->addr == 4) /* WAN port */
+                genphy_config_aneg(phydev);
+
+        return 0;
+}
+
+static struct phy_driver ip175c_driver = {
+        .phy_id         = 0x02430d80,
+        .name           = "ICPlus IP175C",
+        .phy_id_mask    = 0x0ffffff0,
+        .features       = PHY_BASIC_FEATURES,
+        .config_init    = &ip175c_config_init,
+        .config_aneg    = &ip175c_config_aneg,
+        .read_status    = &ip175c_read_status,
+        .driver         = { .owner = THIS_MODULE,},
+};
+
+static int __init ip175c_init(void)
+{
+        return phy_driver_register(&ip175c_driver);
+}
+
+static void __exit ip175c_exit(void)
+{
+        phy_driver_unregister(&ip175c_driver);
+}
+
+module_init(ip175c_init);
+module_exit(ip175c_exit);
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b87f8d2a888b..fbe1104e9a07 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -60,6 +60,7 @@
 #define MII_M1111_PHY_EXT_SR            0x1b
 #define MII_M1111_HWCFG_MODE_MASK       0xf
 #define MII_M1111_HWCFG_MODE_RGMII      0xb
+#define MII_M1111_HWCFG_MODE_SGMII_NO_CLK       0x4
 
 MODULE_DESCRIPTION("Marvell PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -169,6 +170,21 @@ static int m88e1111_config_init(struct phy_device *phydev)
                         return err;
         }
 
+        if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
+                int temp;
+
+                temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
+                if (temp < 0)
+                        return temp;
+
+                temp &= ~(MII_M1111_HWCFG_MODE_MASK);
+                temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK;
+
+                err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+                if (err < 0)
+                        return err;
+        }
+
         err = phy_write(phydev, MII_BMCR, BMCR_RESET);
         if (err < 0)
                 return err;
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 585be044ebbb..8be8be451ada 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2433,37 +2433,22 @@ static int ql_get_seg_count(struct ql3_adapter *qdev,
         return -1;
 }
 
-static void ql_hw_csum_setup(struct sk_buff *skb,
+static void ql_hw_csum_setup(const struct sk_buff *skb,
                              struct ob_mac_iocb_req *mac_iocb_ptr)
 {
-        struct ethhdr *eth;
-        struct iphdr *ip = NULL;
-        u8 offset = ETH_HLEN;
+        const struct iphdr *ip = ip_hdr(skb);
 
-        eth = (struct ethhdr *)(skb->data);
+        mac_iocb_ptr->ip_hdr_off = skb_network_offset(skb);
+        mac_iocb_ptr->ip_hdr_len = ip->ihl;
 
-        if (eth->h_proto == __constant_htons(ETH_P_IP)) {
-                ip = (struct iphdr *)&skb->data[ETH_HLEN];
-        } else if (eth->h_proto == htons(ETH_P_8021Q) &&
-                   ((struct vlan_ethhdr *)skb->data)->
-                   h_vlan_encapsulated_proto == __constant_htons(ETH_P_IP)) {
-                ip = (struct iphdr *)&skb->data[VLAN_ETH_HLEN];
-                offset = VLAN_ETH_HLEN;
-        }
-
-        if (ip) {
-                if (ip->protocol == IPPROTO_TCP) {
-                        mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_TC | 
+        if (ip->protocol == IPPROTO_TCP) {
+                mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_TC |
                         OB_3032MAC_IOCB_REQ_IC;
-                        mac_iocb_ptr->ip_hdr_off = offset;
-                        mac_iocb_ptr->ip_hdr_len = ip->ihl;
-                } else if (ip->protocol == IPPROTO_UDP) {
-                        mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_UC | 
+        } else {
+                mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_UC |
                         OB_3032MAC_IOCB_REQ_IC;
-                        mac_iocb_ptr->ip_hdr_off = offset;
-                        mac_iocb_ptr->ip_hdr_len = ip->ihl;
-                }
         }
+
 }
 
 /*
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5ec7752caa48..982a9010c7a9 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1,53 +1,11 @@
 /*
-=========================================================================
- r8169.c: A RealTek RTL-8169 Gigabit Ethernet driver for Linux kernel 2.4.x.
- --------------------------------------------------------------------
-
- History:
- Feb  4 2002    - created initially by ShuChen <shuchen@realtek.com.tw>.
- May 20 2002    - Add link status force-mode and TBI mode support.
-        2004    - Massive updates. See kernel SCM system for details.
-=========================================================================
-  1. [DEPRECATED: use ethtool instead] The media can be forced in 5 modes.
-         Command: 'insmod r8169 media = SET_MEDIA'
-         Ex:      'insmod r8169 media = 0x04' will force PHY to operate in 100Mpbs Half-duplex.
-
-         SET_MEDIA can be:
-                _10_Half        = 0x01
-                _10_Full        = 0x02
-                _100_Half       = 0x04
-                _100_Full       = 0x08
-                _1000_Full      = 0x10
-
-  2. Support TBI mode.
-=========================================================================
-VERSION 1.1     <2002/10/4>
-
-        The bit4:0 of MII register 4 is called "selector field", and have to be
-        00001b to indicate support of IEEE std 802.3 during NWay process of
-        exchanging Link Code Word (FLP).
-
-VERSION 1.2     <2002/11/30>
-
-        - Large style cleanup
-        - Use ether_crc in stock kernel (linux/crc32.h)
-        - Copy mc_filter setup code from 8139cp
-          (includes an optimization, and avoids set_bit use)
-
-VERSION 1.6LK   <2004/04/14>
-
-        - Merge of Realtek's version 1.6
-        - Conversion to DMA API
-        - Suspend/resume
-        - Endianness
-        - Misc Rx/Tx bugs
-
-VERSION 2.2LK   <2005/01/25>
-
-        - RX csum, TX csum/SG, TSO
-        - VLAN
-        - baby (< 7200) Jumbo frames support
-        - Merge of Realtek's version 2.2 (new phy)
+ * r8169.c: RealTek 8169/8168/8101 ethernet driver.
+ *
+ * Copyright (c) 2002 ShuChen <shuchen@realtek.com.tw>
+ * Copyright (c) 2003 - 2007 Francois Romieu <romieu@fr.zoreil.com>
+ * Copyright (c) a lot of people too. Please respect their work.
+ *
+ * See MAINTAINERS file for support contact information.
  */
 
 #include <linux/module.h>
@@ -108,11 +66,6 @@ VERSION 2.2LK	<2005/01/25>
 #define rtl8169_rx_quota(count, quota)  count
 #endif
 
-/* media options */
-#define MAX_UNITS 8
-static int media[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 };
-static int num_media = 0;
-
 /* Maximum events (Rx packets, etc.) to handle at each interrupt. */
 static const int max_interrupt_work = 20;
 
@@ -126,7 +79,7 @@ static const int multicast_filter_limit = 32;
 #define RX_FIFO_THRESH  7       /* 7 means NO threshold, Rx buffer level before first PCI xfer. */
 #define RX_DMA_BURST    6       /* Maximum PCI burst, '6' is 1024 */
 #define TX_DMA_BURST    6       /* Maximum PCI burst, '6' is 1024 */
-#define EarlyTxThld     0x3F    /* 0x3F means NO early transmit */
+#define EarlyTxThld     0x3F    /* 0x3F means NO early transmit */
 #define RxPacketMaxSize 0x3FE8  /* 16K - 1 - ETH_HLEN - VLAN - CRC... */
 #define SafeMtu         0x1c20  /* ... actually life sucks beyond ~7k */
 #define InterFrameGap   0x03    /* 3 means InterFrameGap = the shortest one */
@@ -151,16 +104,17 @@ static const int multicast_filter_limit = 32;
 #define RTL_R32(reg)            ((unsigned long) readl (ioaddr + (reg)))
 
 enum mac_version {
-        RTL_GIGA_MAC_VER_01 = 0x00,
-        RTL_GIGA_MAC_VER_02 = 0x01,
-        RTL_GIGA_MAC_VER_03 = 0x02,
-        RTL_GIGA_MAC_VER_04 = 0x03,
-        RTL_GIGA_MAC_VER_05 = 0x04,
-        RTL_GIGA_MAC_VER_11 = 0x0b,
-        RTL_GIGA_MAC_VER_12 = 0x0c,
-        RTL_GIGA_MAC_VER_13 = 0x0d,
-        RTL_GIGA_MAC_VER_14 = 0x0e,
-        RTL_GIGA_MAC_VER_15 = 0x0f
+        RTL_GIGA_MAC_VER_01 = 0x01, // 8169
+        RTL_GIGA_MAC_VER_02 = 0x02, // 8169S
+        RTL_GIGA_MAC_VER_03 = 0x03, // 8110S
+        RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB
+        RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd
+        RTL_GIGA_MAC_VER_06 = 0x06, // 8110SCe
+        RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb
+        RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be 8168Bf
+        RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb 8101Ec
+        RTL_GIGA_MAC_VER_14 = 0x0e, // 8101
+        RTL_GIGA_MAC_VER_15 = 0x0f  // 8101
 };
 
 enum phy_version {
@@ -180,11 +134,12 @@ static const struct {
         u8 mac_version;
         u32 RxConfigMask;       /* Clears the bits supported by this chip */
 } rtl_chip_info[] = {
-        _R("RTL8169",           RTL_GIGA_MAC_VER_01, 0xff7e1880),
-        _R("RTL8169s/8110s",    RTL_GIGA_MAC_VER_02, 0xff7e1880),
-        _R("RTL8169s/8110s",    RTL_GIGA_MAC_VER_03, 0xff7e1880),
-        _R("RTL8169sb/8110sb",  RTL_GIGA_MAC_VER_04, 0xff7e1880),
-        _R("RTL8169sc/8110sc",  RTL_GIGA_MAC_VER_05, 0xff7e1880),
+        _R("RTL8169",           RTL_GIGA_MAC_VER_01, 0xff7e1880), // 8169
+        _R("RTL8169s",          RTL_GIGA_MAC_VER_02, 0xff7e1880), // 8169S
+        _R("RTL8110s",          RTL_GIGA_MAC_VER_03, 0xff7e1880), // 8110S
+        _R("RTL8169sb/8110sb",  RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB
+        _R("RTL8169sc/8110sc",  RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd
+        _R("RTL8169sc/8110sc",  RTL_GIGA_MAC_VER_06, 0xff7e1880), // 8110SCe
         _R("RTL8168b/8111b",    RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E
         _R("RTL8168b/8111b",    RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E
         _R("RTL8101e",          RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139
@@ -199,20 +154,15 @@ enum cfg_version {
         RTL_CFG_2
 };
 
-static const struct {
-        unsigned int region;
-        unsigned int align;
-} rtl_cfg_info[] = {
-        [RTL_CFG_0] = { 1, NET_IP_ALIGN },
-        [RTL_CFG_1] = { 2, NET_IP_ALIGN },
-        [RTL_CFG_2] = { 2, 8 }
-};
+static void rtl_hw_start_8169(struct net_device *);
+static void rtl_hw_start_8168(struct net_device *);
+static void rtl_hw_start_8101(struct net_device *);
 
 static struct pci_device_id rtl8169_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8129), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8136), 0, 0, RTL_CFG_2 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8168), 0, 0, RTL_CFG_2 },
+        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8168), 0, 0, RTL_CFG_1 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_DLINK,       0x4300), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(0x1259,                    0xc107), 0, 0, RTL_CFG_0 },
@@ -230,62 +180,63 @@ static struct {
         u32 msg_enable;
 } debug = { -1 };
 
-enum RTL8169_registers {
-        MAC0 = 0,               /* Ethernet hardware address. */
-        MAR0 = 8,               /* Multicast filter. */
-        CounterAddrLow = 0x10,
-        CounterAddrHigh = 0x14,
-        TxDescStartAddrLow = 0x20,
-        TxDescStartAddrHigh = 0x24,
-        TxHDescStartAddrLow = 0x28,
-        TxHDescStartAddrHigh = 0x2c,
-        FLASH = 0x30,
-        ERSR = 0x36,
-        ChipCmd = 0x37,
-        TxPoll = 0x38,
-        IntrMask = 0x3C,
-        IntrStatus = 0x3E,
-        TxConfig = 0x40,
-        RxConfig = 0x44,
-        RxMissed = 0x4C,
-        Cfg9346 = 0x50,
-        Config0 = 0x51,
-        Config1 = 0x52,
-        Config2 = 0x53,
-        Config3 = 0x54,
-        Config4 = 0x55,
-        Config5 = 0x56,
-        MultiIntr = 0x5C,
-        PHYAR = 0x60,
-        TBICSR = 0x64,
-        TBI_ANAR = 0x68,
-        TBI_LPAR = 0x6A,
-        PHYstatus = 0x6C,
-        RxMaxSize = 0xDA,
-        CPlusCmd = 0xE0,
-        IntrMitigate = 0xE2,
-        RxDescAddrLow = 0xE4,
-        RxDescAddrHigh = 0xE8,
-        EarlyTxThres = 0xEC,
-        FuncEvent = 0xF0,
-        FuncEventMask = 0xF4,
-        FuncPresetState = 0xF8,
-        FuncForceEvent = 0xFC,
+enum rtl_registers {
+        MAC0            = 0,    /* Ethernet hardware address. */
+        MAC4            = 4,
+        MAR0            = 8,    /* Multicast filter. */
+        CounterAddrLow          = 0x10,
+        CounterAddrHigh         = 0x14,
+        TxDescStartAddrLow      = 0x20,
+        TxDescStartAddrHigh     = 0x24,
+        TxHDescStartAddrLow     = 0x28,
+        TxHDescStartAddrHigh    = 0x2c,
+        FLASH           = 0x30,
+        ERSR            = 0x36,
+        ChipCmd         = 0x37,
+        TxPoll          = 0x38,
+        IntrMask        = 0x3c,
+        IntrStatus      = 0x3e,
+        TxConfig        = 0x40,
+        RxConfig        = 0x44,
+        RxMissed        = 0x4c,
+        Cfg9346         = 0x50,
+        Config0         = 0x51,
+        Config1         = 0x52,
+        Config2         = 0x53,
+        Config3         = 0x54,
+        Config4         = 0x55,
+        Config5         = 0x56,
+        MultiIntr       = 0x5c,
+        PHYAR           = 0x60,
+        TBICSR          = 0x64,
+        TBI_ANAR        = 0x68,
+        TBI_LPAR        = 0x6a,
+        PHYstatus       = 0x6c,
+        RxMaxSize       = 0xda,
+        CPlusCmd        = 0xe0,
+        IntrMitigate    = 0xe2,
+        RxDescAddrLow   = 0xe4,
+        RxDescAddrHigh  = 0xe8,
+        EarlyTxThres    = 0xec,
+        FuncEvent       = 0xf0,
+        FuncEventMask   = 0xf4,
+        FuncPresetState = 0xf8,
+        FuncForceEvent  = 0xfc,
 };
 
-enum RTL8169_register_content {
+enum rtl_register_content {
         /* InterruptStatusBits */
-        SYSErr = 0x8000,
-        PCSTimeout = 0x4000,
-        SWInt = 0x0100,
-        TxDescUnavail = 0x80,
-        RxFIFOOver = 0x40,
-        LinkChg = 0x20,
-        RxOverflow = 0x10,
-        TxErr = 0x08,
-        TxOK = 0x04,
-        RxErr = 0x02,
-        RxOK = 0x01,
+        SYSErr          = 0x8000,
+        PCSTimeout      = 0x4000,
+        SWInt           = 0x0100,
+        TxDescUnavail   = 0x0080,
+        RxFIFOOver      = 0x0040,
+        LinkChg         = 0x0020,
+        RxOverflow      = 0x0010,
+        TxErr           = 0x0008,
+        TxOK            = 0x0004,
+        RxErr           = 0x0002,
+        RxOK            = 0x0001,
 
         /* RxStatusDesc */
         RxFOVF  = (1 << 23),
@@ -295,26 +246,31 @@ enum RTL8169_register_content {
         RxCRC   = (1 << 19),
 
         /* ChipCmdBits */
-        CmdReset = 0x10,
-        CmdRxEnb = 0x08,
-        CmdTxEnb = 0x04,
-        RxBufEmpty = 0x01,
+        CmdReset        = 0x10,
+        CmdRxEnb        = 0x08,
+        CmdTxEnb        = 0x04,
+        RxBufEmpty      = 0x01,
+
+        /* TXPoll register p.5 */
+        HPQ             = 0x80,         /* Poll cmd on the high prio queue */
+        NPQ             = 0x40,         /* Poll cmd on the low prio queue */
+        FSWInt          = 0x01,         /* Forced software interrupt */
 
         /* Cfg9346Bits */
-        Cfg9346_Lock = 0x00,
-        Cfg9346_Unlock = 0xC0,
+        Cfg9346_Lock    = 0x00,
+        Cfg9346_Unlock  = 0xc0,
 
         /* rx_mode_bits */
-        AcceptErr = 0x20,
-        AcceptRunt = 0x10,
-        AcceptBroadcast = 0x08,
-        AcceptMulticast = 0x04,
-        AcceptMyPhys = 0x02,
-        AcceptAllPhys = 0x01,
+        AcceptErr       = 0x20,
+        AcceptRunt      = 0x10,
+        AcceptBroadcast = 0x08,
+        AcceptMulticast = 0x04,
+        AcceptMyPhys    = 0x02,
+        AcceptAllPhys   = 0x01,
 
         /* RxConfigBits */
-        RxCfgFIFOShift = 13,
-        RxCfgDMAShift = 8,
+        RxCfgFIFOShift  = 13,
+        RxCfgDMAShift   =  8,
 
         /* TxConfigBits */
         TxInterFrameGapShift = 24,
@@ -323,6 +279,10 @@ enum RTL8169_register_content {
         /* Config1 register p.24 */
         PMEnable        = (1 << 0),     /* Power Management Enable */
 
+        /* Config2 register p. 25 */
+        PCI_Clock_66MHz = 0x01,
+        PCI_Clock_33MHz = 0x00,
+
         /* Config3 register p.25 */
         MagicPacket     = (1 << 5),     /* Wake up when receives a Magic Packet */
         LinkUp          = (1 << 4),     /* Wake up when the cable connection is re-established */
@@ -343,36 +303,34 @@ enum RTL8169_register_content {
         TBINwComplete   = 0x01000000,
 
         /* CPlusCmd p.31 */
+        PktCntrDisable  = (1 << 7),     // 8168
         RxVlan          = (1 << 6),
         RxChkSum        = (1 << 5),
         PCIDAC          = (1 << 4),
         PCIMulRW        = (1 << 3),
+        INTT_0          = 0x0000,       // 8168
+        INTT_1          = 0x0001,       // 8168
+        INTT_2          = 0x0002,       // 8168
+        INTT_3          = 0x0003,       // 8168
 
         /* rtl8169_PHYstatus */
-        TBI_Enable = 0x80,
-        TxFlowCtrl = 0x40,
-        RxFlowCtrl = 0x20,
-        _1000bpsF = 0x10,
-        _100bps = 0x08,
-        _10bps = 0x04,
-        LinkStatus = 0x02,
-        FullDup = 0x01,
-
-        /* _MediaType */
-        _10_Half = 0x01,
-        _10_Full = 0x02,
-        _100_Half = 0x04,
-        _100_Full = 0x08,
-        _1000_Full = 0x10,
+        TBI_Enable      = 0x80,
+        TxFlowCtrl      = 0x40,
+        RxFlowCtrl      = 0x20,
+        _1000bpsF       = 0x10,
+        _100bps         = 0x08,
+        _10bps          = 0x04,
+        LinkStatus      = 0x02,
+        FullDup         = 0x01,
 
         /* _TBICSRBit */
-        TBILinkOK = 0x02000000,
+        TBILinkOK       = 0x02000000,
 
         /* DumpCounterCommand */
-        CounterDump = 0x8,
+        CounterDump     = 0x8,
 };
 
-enum _DescStatusBit {
+enum desc_status_bit {
         DescOwn         = (1 << 31), /* Descriptor is owned by NIC */
         RingEnd         = (1 << 30), /* End of descriptor ring */
         FirstFrag       = (1 << 29), /* First segment of a packet */
@@ -405,15 +363,15 @@ enum _DescStatusBit {
 #define RsvdMask        0x3fffc000
 
 struct TxDesc {
-        u32 opts1;
-        u32 opts2;
-        u64 addr;
+        __le32 opts1;
+        __le32 opts2;
+        __le64 addr;
 };
 
 struct RxDesc {
-        u32 opts1;
-        u32 opts2;
-        u64 addr;
+        __le32 opts1;
+        __le32 opts2;
+        __le64 addr;
 };
 
 struct ring_info {
@@ -446,6 +404,8 @@ struct rtl8169_private {
         unsigned rx_buf_sz;
         struct timer_list timer;
         u16 cp_cmd;
+        u16 intr_event;
+        u16 napi_event;
         u16 intr_mask;
         int phy_auto_nego_reg;
         int phy_1000_ctrl_reg;
@@ -455,6 +415,7 @@ struct rtl8169_private {
         int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex);
         void (*get_settings)(struct net_device *, struct ethtool_cmd *);
         void (*phy_reset_enable)(void __iomem *);
+        void (*hw_start)(struct net_device *);
         unsigned int (*phy_reset_pending)(void __iomem *);
         unsigned int (*link_ok)(void __iomem *);
         struct delayed_work task;
@@ -463,8 +424,6 @@ struct rtl8169_private {
 
 MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
 MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver");
-module_param_array(media, int, &num_media, 0);
-MODULE_PARM_DESC(media, "force phy operation. Deprecated by ethtool (8).");
 module_param(rx_copybreak, int, 0);
 MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
 module_param(use_dac, int, 0);
@@ -478,9 +437,9 @@ static int rtl8169_open(struct net_device *dev);
 static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance);
 static int rtl8169_init_ring(struct net_device *dev);
-static void rtl8169_hw_start(struct net_device *dev);
+static void rtl_hw_start(struct net_device *dev);
 static int rtl8169_close(struct net_device *dev);
-static void rtl8169_set_rx_mode(struct net_device *dev);
+static void rtl_set_rx_mode(struct net_device *dev);
 static void rtl8169_tx_timeout(struct net_device *dev);
 static struct net_device_stats *rtl8169_get_stats(struct net_device *dev);
 static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *,
@@ -493,35 +452,37 @@ static void rtl8169_rx_clear(struct rtl8169_private *tp);
 static int rtl8169_poll(struct net_device *dev, int *budget);
 #endif
 
-static const u16 rtl8169_intr_mask =
-        SYSErr | LinkChg | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
-static const u16 rtl8169_napi_event =
-        RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
 static const unsigned int rtl8169_rx_config =
         (RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift);
 
-static void mdio_write(void __iomem *ioaddr, int RegAddr, int value)
+static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
 {
         int i;
 
-        RTL_W32(PHYAR, 0x80000000 | (RegAddr & 0xFF) << 16 | value);
+        RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0xFF) << 16 | value);
 
         for (i = 20; i > 0; i--) {
-                /* Check if the RTL8169 has completed writing to the specified MII register */
+                /*
+                 * Check if the RTL8169 has completed writing to the specified
+                 * MII register.
+                 */
                 if (!(RTL_R32(PHYAR) & 0x80000000))
                         break;
                 udelay(25);
         }
 }
 
-static int mdio_read(void __iomem *ioaddr, int RegAddr)
+static int mdio_read(void __iomem *ioaddr, int reg_addr)
 {
         int i, value = -1;
 
-        RTL_W32(PHYAR, 0x0 | (RegAddr & 0xFF) << 16);
+        RTL_W32(PHYAR, 0x0 | (reg_addr & 0xFF) << 16);
 
         for (i = 20; i > 0; i--) {
-                /* Check if the RTL8169 has completed retrieving data from the specified MII register */
+                /*
+                 * Check if the RTL8169 has completed retrieving data from
+                 * the specified MII register.
+                 */
                 if (RTL_R32(PHYAR) & 0x80000000) {
                         value = (int) (RTL_R32(PHYAR) & 0xFFFF);
                         break;
@@ -579,7 +540,8 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr)
 }
 
 static void rtl8169_check_link_status(struct net_device *dev,
-                                      struct rtl8169_private *tp, void __iomem *ioaddr)
+                                      struct rtl8169_private *tp,
+                                      void __iomem *ioaddr)
 {
         unsigned long flags;
 
@@ -596,38 +558,6 @@ static void rtl8169_check_link_status(struct net_device *dev,
         spin_unlock_irqrestore(&tp->lock, flags);
 }
 
-static void rtl8169_link_option(int idx, u8 *autoneg, u16 *speed, u8 *duplex)
-{
-        struct {
-                u16 speed;
-                u8 duplex;
-                u8 autoneg;
-                u8 media;
-        } link_settings[] = {
-                { SPEED_10,     DUPLEX_HALF, AUTONEG_DISABLE,   _10_Half },
-                { SPEED_10,     DUPLEX_FULL, AUTONEG_DISABLE,   _10_Full },
-                { SPEED_100,    DUPLEX_HALF, AUTONEG_DISABLE,   _100_Half },
-                { SPEED_100,    DUPLEX_FULL, AUTONEG_DISABLE,   _100_Full },
-                { SPEED_1000,   DUPLEX_FULL, AUTONEG_DISABLE,   _1000_Full },
-                /* Make TBI happy */
-                { SPEED_1000,   DUPLEX_FULL, AUTONEG_ENABLE,    0xff }
-        }, *p;
-        unsigned char option;
-
-        option = ((idx < MAX_UNITS) && (idx >= 0)) ? media[idx] : 0xff;
-
-        if ((option != 0xff) && !idx && netif_msg_drv(&debug))
-                printk(KERN_WARNING PFX "media option is deprecated.\n");
-
-        for (p = link_settings; p->media != 0xff; p++) {
-                if (p->media == option)
-                        break;
-        }
-        *autoneg = p->autoneg;
-        *speed = p->speed;
-        *duplex = p->duplex;
-}
-
 static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -667,7 +597,7 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
-        int i;
+        unsigned int i;
         static struct {
                 u32 opt;
                 u16 reg;
@@ -893,8 +823,7 @@ static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
         int ret;
 
         if (tp->vlgrp && (opts2 & RxVlanTag)) {
-                rtl8169_rx_hwaccel_skb(skb, tp->vlgrp,
-                                       swab16(opts2 & 0xffff));
+                rtl8169_rx_hwaccel_skb(skb, tp->vlgrp, swab16(opts2 & 0xffff));
                 ret = 0;
         } else
                 ret = -1;
@@ -1115,7 +1044,6 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
         }
 }
 
-
 static const struct ethtool_ops rtl8169_ethtool_ops = {
         .get_drvinfo            = rtl8169_get_drvinfo,
         .get_regs_len           = rtl8169_get_regs_len,
@@ -1141,8 +1069,8 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
         .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
-static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg, int bitnum,
-                                       int bitval)
+static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg,
+                                       int bitnum, int bitval)
 {
         int val;
 
@@ -1152,8 +1080,20 @@ static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg, int bitnum
         mdio_write(ioaddr, reg, val & 0xffff);
 }
 
-static void rtl8169_get_mac_version(struct rtl8169_private *tp, void __iomem *ioaddr)
+static void rtl8169_get_mac_version(struct rtl8169_private *tp,
+                                    void __iomem *ioaddr)
 {
+        /*
+         * The driver currently handles the 8168Bf and the 8168Be identically
+         * but they can be identified more specifically through the test below
+         * if needed:
+         *
+         * (RTL_R32(TxConfig) & 0x700000) == 0x500000 ? 8168Bf : 8168Be
+         *
+         * Same thing for the 8101Eb and the 8101Ec:
+         *
+         * (RTL_R32(TxConfig) & 0x700000) == 0x200000 ? 8101Eb : 8101Ec
+         */
         const struct {
                 u32 mask;
                 int mac_version;
@@ -1163,6 +1103,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, void __iomem *io
                 { 0x34000000,   RTL_GIGA_MAC_VER_13 },
                 { 0x30800000,   RTL_GIGA_MAC_VER_14 },
                 { 0x30000000,   RTL_GIGA_MAC_VER_11 },
+                { 0x98000000,   RTL_GIGA_MAC_VER_06 },
                 { 0x18000000,   RTL_GIGA_MAC_VER_05 },
                 { 0x10000000,   RTL_GIGA_MAC_VER_04 },
                 { 0x04000000,   RTL_GIGA_MAC_VER_03 },
@@ -1171,7 +1112,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, void __iomem *io
         }, *p = mac_info;
         u32 reg;
 
-        reg = RTL_R32(TxConfig) & 0x7c800000;
+        reg = RTL_R32(TxConfig) & 0xfc800000;
         while ((reg & p->mask) != p->mask)
                 p++;
         tp->mac_version = p->mac_version;
@@ -1182,7 +1123,8 @@ static void rtl8169_print_mac_version(struct rtl8169_private *tp)
         dprintk("mac_version = 0x%02x\n", tp->mac_version);
 }
 
-static void rtl8169_get_phy_version(struct rtl8169_private *tp, void __iomem *ioaddr)
+static void rtl8169_get_phy_version(struct rtl8169_private *tp,
+                                    void __iomem *ioaddr)
 {
         const struct {
                 u16 mask;
@@ -1259,7 +1201,7 @@ static void rtl8169_hw_phy_config(struct net_device *dev)
                   0xbf00 }      //w 0 15 0 bf00
                 }
         }, *p = phy_magic;
-        int i;
+        unsigned int i;
 
         rtl8169_print_mac_version(tp);
         rtl8169_print_phy_version(tp);
@@ -1393,7 +1335,7 @@ static void rtl8169_phy_reset(struct net_device *dev,
                               struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        int i;
+        unsigned int i;
 
         tp->phy_reset_enable(ioaddr);
         for (i = 0; i < 100; i++) {
@@ -1408,21 +1350,16 @@ static void rtl8169_phy_reset(struct net_device *dev,
 static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        static int board_idx = -1;
-        u8 autoneg, duplex;
-        u16 speed;
-
-        board_idx++;
 
         rtl8169_hw_phy_config(dev);
 
         dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
         RTL_W8(0x82, 0x01);
 
-        if (tp->mac_version < RTL_GIGA_MAC_VER_03) {
-                dprintk("Set PCI Latency=0x40\n");
-                pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40);
-        }
+        pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40);
+
+        if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
+                pci_write_config_byte(tp->pci_dev, PCI_CACHE_LINE_SIZE, 0x08);
 
         if (tp->mac_version == RTL_GIGA_MAC_VER_02) {
                 dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
@@ -1431,16 +1368,52 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
                 mdio_write(ioaddr, 0x0b, 0x0000); //w 0x0b 15 0 0
         }
 
-        rtl8169_link_option(board_idx, &autoneg, &speed, &duplex);
-
         rtl8169_phy_reset(dev, tp);
 
-        rtl8169_set_speed(dev, autoneg, speed, duplex);
+        /*
+         * rtl8169_set_speed_xmii takes good care of the Fast Ethernet
+         * only 8101. Don't panic.
+         */
+        rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL);
 
         if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp))
                 printk(KERN_INFO PFX "%s: TBI auto-negotiating\n", dev->name);
 }
 
+static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        u32 high;
+        u32 low;
+
+        low  = addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);
+        high = addr[4] | (addr[5] << 8);
+
+        spin_lock_irq(&tp->lock);
+
+        RTL_W8(Cfg9346, Cfg9346_Unlock);
+        RTL_W32(MAC0, low);
+        RTL_W32(MAC4, high);
+        RTL_W8(Cfg9346, Cfg9346_Lock);
+
+        spin_unlock_irq(&tp->lock);
+}
+
+static int rtl_set_mac_address(struct net_device *dev, void *p)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        struct sockaddr *addr = p;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
+        rtl_rar_set(tp, dev->dev_addr);
+
+        return 0;
+}
+
 static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -1467,15 +1440,49 @@ static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return -EOPNOTSUPP;
 }
 
+static const struct rtl_cfg_info {
+        void (*hw_start)(struct net_device *);
+        unsigned int region;
+        unsigned int align;
+        u16 intr_event;
+        u16 napi_event;
+} rtl_cfg_infos [] = {
+        [RTL_CFG_0] = {
+                .hw_start       = rtl_hw_start_8169,
+                .region         = 1,
+                .align          = 0,
+                .intr_event     = SYSErr | LinkChg | RxOverflow |
+                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
+                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
+        },
+        [RTL_CFG_1] = {
+                .hw_start       = rtl_hw_start_8168,
+                .region         = 2,
+                .align          = 8,
+                .intr_event     = SYSErr | LinkChg | RxOverflow |
+                                  TxErr | TxOK | RxOK | RxErr,
+                .napi_event     = TxErr | TxOK | RxOK | RxOverflow
+        },
+        [RTL_CFG_2] = {
+                .hw_start       = rtl_hw_start_8101,
+                .region         = 2,
+                .align          = 8,
+                .intr_event     = SYSErr | LinkChg | RxOverflow | PCSTimeout |
+                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
+                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
+        }
+};
+
 static int __devinit
 rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        const unsigned int region = rtl_cfg_info[ent->driver_data].region;
+        const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
+        const unsigned int region = cfg->region;
         struct rtl8169_private *tp;
         struct net_device *dev;
         void __iomem *ioaddr;
-        unsigned int pm_cap;
-        int i, rc;
+        unsigned int i;
+        int rc;
 
         if (netif_msg_drv(&debug)) {
                 printk(KERN_INFO "%s Gigabit Ethernet driver %s loaded\n",
@@ -1508,20 +1515,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (rc < 0)
                 goto err_out_disable_2;
 
-        /* save power state before pci_enable_device overwrites it */
-        pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
-        if (pm_cap) {
-                u16 pwr_command, acpi_idle_state;
-
-                pci_read_config_word(pdev, pm_cap + PCI_PM_CTRL, &pwr_command);
-                acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
-        } else {
-                if (netif_msg_probe(tp)) {
-                        dev_err(&pdev->dev,
-                                "PowerManagement capability not found.\n");
-                }
-        }
-
         /* make sure PCI base addr 1 is MMIO */
         if (!(pci_resource_flags(pdev, region) & IORESOURCE_MEM)) {
                 if (netif_msg_probe(tp)) {
@@ -1585,7 +1578,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         RTL_W8(ChipCmd, CmdReset);
 
         /* Check that the chip has finished the reset. */
-        for (i = 100; i > 0; i--) {
+        for (i = 0; i < 100; i++) {
                 if ((RTL_R8(ChipCmd) & CmdReset) == 0)
                         break;
                 msleep_interruptible(1);
@@ -1647,11 +1640,12 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
         dev->stop = rtl8169_close;
         dev->tx_timeout = rtl8169_tx_timeout;
-        dev->set_multicast_list = rtl8169_set_rx_mode;
+        dev->set_multicast_list = rtl_set_rx_mode;
         dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
         dev->irq = pdev->irq;
         dev->base_addr = (unsigned long) ioaddr;
         dev->change_mtu = rtl8169_change_mtu;
+        dev->set_mac_address = rtl_set_mac_address;
 
 #ifdef CONFIG_R8169_NAPI
         dev->poll = rtl8169_poll;
@@ -1670,7 +1664,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         tp->intr_mask = 0xffff;
         tp->pci_dev = pdev;
         tp->mmio_addr = ioaddr;
-        tp->align = rtl_cfg_info[ent->driver_data].align;
+        tp->align = cfg->align;
+        tp->hw_start = cfg->hw_start;
+        tp->intr_event = cfg->intr_event;
+        tp->napi_event = cfg->napi_event;
 
         init_timer(&tp->timer);
         tp->timer.data = (unsigned long) dev;
@@ -1685,15 +1682,17 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         pci_set_drvdata(pdev, dev);
 
         if (netif_msg_probe(tp)) {
+                u32 xid = RTL_R32(TxConfig) & 0x7cf0f8ff;
+
                 printk(KERN_INFO "%s: %s at 0x%lx, "
                        "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
-                       "IRQ %d\n",
+                       "XID %08x IRQ %d\n",
                        dev->name,
                        rtl_chip_info[tp->chipset].name,
                        dev->base_addr,
                        dev->dev_addr[0], dev->dev_addr[1],
                        dev->dev_addr[2], dev->dev_addr[3],
-                       dev->dev_addr[4], dev->dev_addr[5], dev->irq);
+                       dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq);
         }
 
         rtl8169_init_phy(dev, tp);
@@ -1714,15 +1713,11 @@ err_out_free_dev_1:
         goto out;
 }
 
-static void __devexit
-rtl8169_remove_one(struct pci_dev *pdev)
+static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct rtl8169_private *tp = netdev_priv(dev);
 
-        assert(dev != NULL);
-        assert(tp != NULL);
-
         flush_scheduled_work();
 
         unregister_netdev(dev);
@@ -1774,7 +1769,7 @@ static int rtl8169_open(struct net_device *dev)
         if (retval < 0)
                 goto err_release_ring_2;
 
-        rtl8169_hw_start(dev);
+        rtl_hw_start(dev);
 
         rtl8169_request_timer(dev);
 
@@ -1805,7 +1800,7 @@ static void rtl8169_hw_reset(void __iomem *ioaddr)
         RTL_R8(ChipCmd);
 }
 
-static void rtl8169_set_rx_tx_config_registers(struct rtl8169_private *tp)
+static void rtl_set_rx_tx_config_registers(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
         u32 cfg = rtl8169_rx_config;
@@ -1818,45 +1813,90 @@ static void rtl8169_set_rx_tx_config_registers(struct rtl8169_private *tp)
                 (InterFrameGap << TxInterFrameGapShift));
 }
 
-static void rtl8169_hw_start(struct net_device *dev)
+static void rtl_hw_start(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
-        struct pci_dev *pdev = tp->pci_dev;
-        u16 cmd;
-        u32 i;
+        unsigned int i;
 
         /* Soft reset the chip. */
         RTL_W8(ChipCmd, CmdReset);
 
         /* Check that the chip has finished the reset. */
-        for (i = 100; i > 0; i--) {
+        for (i = 0; i < 100; i++) {
                 if ((RTL_R8(ChipCmd) & CmdReset) == 0)
                         break;
                 msleep_interruptible(1);
         }
 
-        if (tp->mac_version == RTL_GIGA_MAC_VER_05) {
-                RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW);
-                pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08);
-        }
+        tp->hw_start(dev);
 
-        if (tp->mac_version == RTL_GIGA_MAC_VER_13) {
-                pci_write_config_word(pdev, 0x68, 0x00);
-                pci_write_config_word(pdev, 0x69, 0x08);
-        }
+        netif_start_queue(dev);
+}
 
-        /* Undocumented stuff. */
-        if (tp->mac_version == RTL_GIGA_MAC_VER_05) {
-                /* Realtek's r1000_n.c driver uses '&& 0x01' here. Well... */
-                if ((RTL_R8(Config2) & 0x07) & 0x01)
-                        RTL_W32(0x7c, 0x0007ffff);
 
-                RTL_W32(0x7c, 0x0007ff00);
+static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp,
+                                         void __iomem *ioaddr)
+{
+        /*
+         * Magic spell: some iop3xx ARM board needs the TxDescAddrHigh
+         * register to be written before TxDescAddrLow to work.
+         * Switching from MMIO to I/O access fixes the issue as well.
+         */
+        RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32);
+        RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_32BIT_MASK);
+        RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr) >> 32);
+        RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_32BIT_MASK);
+}
+
+static u16 rtl_rw_cpluscmd(void __iomem *ioaddr)
+{
+        u16 cmd;
+
+        cmd = RTL_R16(CPlusCmd);
+        RTL_W16(CPlusCmd, cmd);
+        return cmd;
+}
+
+static void rtl_set_rx_max_size(void __iomem *ioaddr)
+{
+        /* Low hurts. Let's disable the filtering. */
+        RTL_W16(RxMaxSize, 16383);
+}
+
+static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
+{
+        struct {
+                u32 mac_version;
+                u32 clk;
+                u32 val;
+        } cfg2_info [] = {
+                { RTL_GIGA_MAC_VER_05, PCI_Clock_33MHz, 0x000fff00 }, // 8110SCd
+                { RTL_GIGA_MAC_VER_05, PCI_Clock_66MHz, 0x000fffff },
+                { RTL_GIGA_MAC_VER_06, PCI_Clock_33MHz, 0x00ffff00 }, // 8110SCe
+                { RTL_GIGA_MAC_VER_06, PCI_Clock_66MHz, 0x00ffffff }
+        }, *p = cfg2_info;
+        unsigned int i;
+        u32 clk;
 
-                pci_read_config_word(pdev, PCI_COMMAND, &cmd);
-                cmd = cmd & 0xef;
-                pci_write_config_word(pdev, PCI_COMMAND, cmd);
+        clk = RTL_R8(Config2) & PCI_Clock_66MHz;
+        for (i = 0; i < ARRAY_SIZE(cfg2_info); i++) {
+                if ((p->mac_version == mac_version) && (p->clk == clk)) {
+                        RTL_W32(0x7c, p->val);
+                        break;
+                }
+        }
+}
+
+static void rtl_hw_start_8169(struct net_device *dev)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        if (tp->mac_version == RTL_GIGA_MAC_VER_05) {
+                RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW);
+                pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08);
         }
 
         RTL_W8(Cfg9346, Cfg9346_Unlock);
@@ -1868,19 +1908,11 @@ static void rtl8169_hw_start(struct net_device *dev)
 
         RTL_W8(EarlyTxThres, EarlyTxThld);
 
-        /* Low hurts. Let's disable the filtering. */
-        RTL_W16(RxMaxSize, 16383);
-
-        if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||
-            (tp->mac_version == RTL_GIGA_MAC_VER_02) ||
-            (tp->mac_version == RTL_GIGA_MAC_VER_03) ||
-            (tp->mac_version == RTL_GIGA_MAC_VER_04))
-                rtl8169_set_rx_tx_config_registers(tp);
+        rtl_set_rx_max_size(ioaddr);
 
-        cmd = RTL_R16(CPlusCmd);
-        RTL_W16(CPlusCmd, cmd);
+        rtl_set_rx_tx_config_registers(tp);
 
-        tp->cp_cmd |= cmd | PCIMulRW;
+        tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;
 
         if ((tp->mac_version == RTL_GIGA_MAC_VER_02) ||
             (tp->mac_version == RTL_GIGA_MAC_VER_03)) {
@@ -1891,29 +1923,15 @@ static void rtl8169_hw_start(struct net_device *dev)
 
         RTL_W16(CPlusCmd, tp->cp_cmd);
 
+        rtl8169_set_magic_reg(ioaddr, tp->mac_version);
+
         /*
          * Undocumented corner. Supposedly:
          * (TxTimer << 12) | (TxPackets << 8) | (RxTimer << 4) | RxPackets
          */
         RTL_W16(IntrMitigate, 0x0000);
 
-        /*
-         * Magic spell: some iop3xx ARM board needs the TxDescAddrHigh
-         * register to be written before TxDescAddrLow to work.
-         * Switching from MMIO to I/O access fixes the issue as well.
-         */
-        RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr >> 32));
-        RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_32BIT_MASK));
-        RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr >> 32));
-        RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr & DMA_32BIT_MASK));
-
-        if ((tp->mac_version != RTL_GIGA_MAC_VER_01) &&
-            (tp->mac_version != RTL_GIGA_MAC_VER_02) &&
-            (tp->mac_version != RTL_GIGA_MAC_VER_03) &&
-            (tp->mac_version != RTL_GIGA_MAC_VER_04)) {
-                RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
-                rtl8169_set_rx_tx_config_registers(tp);
-        }
+        rtl_set_rx_tx_desc_registers(tp, ioaddr);
 
         RTL_W8(Cfg9346, Cfg9346_Lock);
 
@@ -1922,15 +1940,107 @@ static void rtl8169_hw_start(struct net_device *dev)
 
         RTL_W32(RxMissed, 0);
 
-        rtl8169_set_rx_mode(dev);
+        rtl_set_rx_mode(dev);
 
         /* no early-rx interrupts */
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
 
         /* Enable all known interrupts by setting the interrupt mask. */
-        RTL_W16(IntrMask, rtl8169_intr_mask);
+        RTL_W16(IntrMask, tp->intr_event);
 
-        netif_start_queue(dev);
+        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+}
+
+static void rtl_hw_start_8168(struct net_device *dev)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+        u8 ctl;
+
+        RTL_W8(Cfg9346, Cfg9346_Unlock);
+
+        RTL_W8(EarlyTxThres, EarlyTxThld);
+
+        rtl_set_rx_max_size(ioaddr);
+
+        rtl_set_rx_tx_config_registers(tp);
+
+        tp->cp_cmd |= RTL_R16(CPlusCmd) | PktCntrDisable | INTT_1;
+
+        RTL_W16(CPlusCmd, tp->cp_cmd);
+
+        /* Tx performance tweak. */
+        pci_read_config_byte(pdev, 0x69, &ctl);
+        ctl = (ctl & ~0x70) | 0x50;
+        pci_write_config_byte(pdev, 0x69, ctl);
+
+        RTL_W16(IntrMitigate, 0x5151);
+
+        /* Work around for RxFIFO overflow. */
+        if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
+                tp->intr_event |= RxFIFOOver | PCSTimeout;
+                tp->intr_event &= ~RxOverflow;
+        }
+
+        rtl_set_rx_tx_desc_registers(tp, ioaddr);
+
+        RTL_W8(Cfg9346, Cfg9346_Lock);
+
+        RTL_R8(IntrMask);
+
+        RTL_W32(RxMissed, 0);
+
+        rtl_set_rx_mode(dev);
+
+        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+
+        RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
+
+        RTL_W16(IntrMask, tp->intr_event);
+}
+
+static void rtl_hw_start_8101(struct net_device *dev)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        if (tp->mac_version == RTL_GIGA_MAC_VER_13) {
+                pci_write_config_word(pdev, 0x68, 0x00);
+                pci_write_config_word(pdev, 0x69, 0x08);
+        }
+
+        RTL_W8(Cfg9346, Cfg9346_Unlock);
+
+        RTL_W8(EarlyTxThres, EarlyTxThld);
+
+        rtl_set_rx_max_size(ioaddr);
+
+        tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;
+
+        RTL_W16(CPlusCmd, tp->cp_cmd);
+
+        RTL_W16(IntrMitigate, 0x0000);
+
+        rtl_set_rx_tx_desc_registers(tp, ioaddr);
+
+        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+        rtl_set_rx_tx_config_registers(tp);
+
+        RTL_W8(Cfg9346, Cfg9346_Lock);
+
+        RTL_R8(IntrMask);
+
+        RTL_W32(RxMissed, 0);
+
+        rtl_set_rx_mode(dev);
+
+        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+
+        RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xf000);
+
+        RTL_W16(IntrMask, tp->intr_event);
 }
 
 static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
@@ -1956,7 +2066,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
 
         netif_poll_enable(dev);
 
-        rtl8169_hw_start(dev);
+        rtl_hw_start(dev);
 
         rtl8169_request_timer(dev);
 
@@ -1997,38 +2107,38 @@ static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
         rtl8169_mark_to_asic(desc, rx_buf_sz);
 }
 
-static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
-                                struct RxDesc *desc, int rx_buf_sz,
-                                unsigned int align)
+static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev,
+                                            struct net_device *dev,
+                                            struct RxDesc *desc, int rx_buf_sz,
+                                            unsigned int align)
 {
         struct sk_buff *skb;
         dma_addr_t mapping;
-        int ret = 0;
+        unsigned int pad;
 
-        skb = dev_alloc_skb(rx_buf_sz + align);
+        pad = align ? align : NET_IP_ALIGN;
+
+        skb = netdev_alloc_skb(dev, rx_buf_sz + pad);
         if (!skb)
                 goto err_out;
 
-        skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
-        *sk_buff = skb;
+        skb_reserve(skb, align ? ((pad - 1) & (unsigned long)skb->data) : pad);
 
         mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
                                  PCI_DMA_FROMDEVICE);
 
         rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
-
 out:
-        return ret;
+        return skb;
 
 err_out:
-        ret = -ENOMEM;
         rtl8169_make_unusable_by_asic(desc);
         goto out;
 }
 
 static void rtl8169_rx_clear(struct rtl8169_private *tp)
 {
-        int i;
+        unsigned int i;
 
         for (i = 0; i < NUM_RX_DESC; i++) {
                 if (tp->Rx_skbuff[i]) {
@@ -2043,16 +2153,22 @@ static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev,
 {
         u32 cur;
 
-        for (cur = start; end - cur > 0; cur++) {
-                int ret, i = cur % NUM_RX_DESC;
+        for (cur = start; end - cur != 0; cur++) {
+                struct sk_buff *skb;
+                unsigned int i = cur % NUM_RX_DESC;
+
+                WARN_ON((s32)(end - cur) < 0);
 
                 if (tp->Rx_skbuff[i])
                         continue;
 
-                ret = rtl8169_alloc_rx_skb(tp->pci_dev, tp->Rx_skbuff + i,
-                        tp->RxDescArray + i, tp->rx_buf_sz, tp->align);
-                if (ret < 0)
+                skb = rtl8169_alloc_rx_skb(tp->pci_dev, dev,
+                                           tp->RxDescArray + i,
+                                           tp->rx_buf_sz, tp->align);
+                if (!skb)
                         break;
+
+                tp->Rx_skbuff[i] = skb;
         }
         return cur - start;
 }
@@ -2164,14 +2280,9 @@ static void rtl8169_reinit_task(struct work_struct *work)
 
         ret = rtl8169_open(dev);
         if (unlikely(ret < 0)) {
-                if (net_ratelimit()) {
-                        struct rtl8169_private *tp = netdev_priv(dev);
-
-                        if (netif_msg_drv(tp)) {
-                                printk(PFX KERN_ERR
-                                       "%s: reinit failure (status = %d)."
-                                       " Rescheduling.\n", dev->name, ret);
-                        }
+                if (net_ratelimit() && netif_msg_drv(tp)) {
+                        printk(PFX KERN_ERR "%s: reinit failure (status = %d)."
+                               " Rescheduling.\n", dev->name, ret);
                 }
                 rtl8169_schedule_work(dev, rtl8169_reinit_task);
         }
@@ -2198,16 +2309,12 @@ static void rtl8169_reset_task(struct work_struct *work)
 
         if (tp->dirty_rx == tp->cur_rx) {
                 rtl8169_init_ring_indexes(tp);
-                rtl8169_hw_start(dev);
+                rtl_hw_start(dev);
                 netif_wake_queue(dev);
         } else {
-                if (net_ratelimit()) {
-                        struct rtl8169_private *tp = netdev_priv(dev);
-
-                        if (netif_msg_intr(tp)) {
-                                printk(PFX KERN_EMERG
-                                       "%s: Rx buffers shortage\n", dev->name);
-                        }
+                if (net_ratelimit() && netif_msg_intr(tp)) {
+                        printk(PFX KERN_EMERG "%s: Rx buffers shortage\n",
+                               dev->name);
                 }
                 rtl8169_schedule_work(dev, rtl8169_reset_task);
         }
@@ -2344,7 +2451,7 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         smp_wmb();
 
-        RTL_W8(TxPoll, 0x40);   /* set polling bit */
+        RTL_W8(TxPoll, NPQ);    /* set polling bit */
 
         if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
                 netif_stop_queue(dev);
@@ -2414,16 +2521,12 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
         rtl8169_schedule_work(dev, rtl8169_reinit_task);
 }
 
-static void
-rtl8169_tx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
-                     void __iomem *ioaddr)
+static void rtl8169_tx_interrupt(struct net_device *dev,
+                                 struct rtl8169_private *tp,
+                                 void __iomem *ioaddr)
 {
         unsigned int dirty_tx, tx_left;
 
-        assert(dev != NULL);
-        assert(tp != NULL);
-        assert(ioaddr != NULL);
-
         dirty_tx = tp->dirty_tx;
         smp_rmb();
         tx_left = tp->cur_tx - dirty_tx;
@@ -2480,38 +2583,37 @@ static inline void rtl8169_rx_csum(struct sk_buff *skb, struct RxDesc *desc)
                 skb->ip_summed = CHECKSUM_NONE;
 }
 
-static inline int rtl8169_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
-                                      struct RxDesc *desc, int rx_buf_sz,
-                                      unsigned int align)
+static inline bool rtl8169_try_rx_copy(struct sk_buff **sk_buff,
+                                       struct rtl8169_private *tp, int pkt_size,
+                                       dma_addr_t addr)
 {
-        int ret = -1;
+        struct sk_buff *skb;
+        bool done = false;
 
-        if (pkt_size < rx_copybreak) {
-                struct sk_buff *skb;
+        if (pkt_size >= rx_copybreak)
+                goto out;
 
-                skb = dev_alloc_skb(pkt_size + align);
-                if (skb) {
-                        skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
-                        eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
-                        *sk_buff = skb;
-                        rtl8169_mark_to_asic(desc, rx_buf_sz);
-                        ret = 0;
-                }
-        }
-        return ret;
+        skb = netdev_alloc_skb(tp->dev, pkt_size + NET_IP_ALIGN);
+        if (!skb)
+                goto out;
+
+        pci_dma_sync_single_for_cpu(tp->pci_dev, addr, pkt_size,
+                                    PCI_DMA_FROMDEVICE);
+        skb_reserve(skb, NET_IP_ALIGN);
+        skb_copy_from_linear_data(*sk_buff, skb->data, pkt_size);
+        *sk_buff = skb;
+        done = true;
+out:
+        return done;
 }
 
-static int
-rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
-                     void __iomem *ioaddr)
+static int rtl8169_rx_interrupt(struct net_device *dev,
+                                struct rtl8169_private *tp,
+                                void __iomem *ioaddr)
 {
         unsigned int cur_rx, rx_left;
         unsigned int delta, count;
 
-        assert(dev != NULL);
-        assert(tp != NULL);
-        assert(ioaddr != NULL);
-
         cur_rx = tp->cur_rx;
         rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
         rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota);
@@ -2544,9 +2646,9 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
                         rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
                 } else {
                         struct sk_buff *skb = tp->Rx_skbuff[entry];
+                        dma_addr_t addr = le64_to_cpu(desc->addr);
                         int pkt_size = (status & 0x00001FFF) - 4;
-                        void (*pci_action)(struct pci_dev *, dma_addr_t,
-                                size_t, int) = pci_dma_sync_single_for_device;
+                        struct pci_dev *pdev = tp->pci_dev;
 
                         /*
                          * The driver does not support incoming fragmented
@@ -2562,19 +2664,16 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
 
                         rtl8169_rx_csum(skb, desc);
 
-                        pci_dma_sync_single_for_cpu(tp->pci_dev,
-                                le64_to_cpu(desc->addr), tp->rx_buf_sz,
-                                PCI_DMA_FROMDEVICE);
-
-                        if (rtl8169_try_rx_copy(&skb, pkt_size, desc,
-                                                tp->rx_buf_sz, tp->align)) {
-                                pci_action = pci_unmap_single;
+                        if (rtl8169_try_rx_copy(&skb, tp, pkt_size, addr)) {
+                                pci_dma_sync_single_for_device(pdev, addr,
+                                        pkt_size, PCI_DMA_FROMDEVICE);
+                                rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
+                        } else {
+                                pci_unmap_single(pdev, addr, pkt_size,
+                                                 PCI_DMA_FROMDEVICE);
                                 tp->Rx_skbuff[entry] = NULL;
                         }
 
-                        pci_action(tp->pci_dev, le64_to_cpu(desc->addr),
-                                   tp->rx_buf_sz, PCI_DMA_FROMDEVICE);
-
                         skb_put(skb, pkt_size);
                         skb->protocol = eth_type_trans(skb, dev);
 
@@ -2585,6 +2684,13 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
                         tp->stats.rx_bytes += pkt_size;
                         tp->stats.rx_packets++;
                 }
+
+                /* Work around for AMD plateform. */
+                if ((desc->opts2 & 0xfffe000) &&
+                    (tp->mac_version == RTL_GIGA_MAC_VER_05)) {
+                        desc->opts2 = 0;
+                        cur_rx++;
+                }
         }
 
         count = cur_rx - tp->cur_rx;
@@ -2608,11 +2714,9 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
         return count;
 }
 
-/* The interrupt handler does all of the Rx thread work and cleans up after the Tx thread. */
-static irqreturn_t
-rtl8169_interrupt(int irq, void *dev_instance)
+static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 {
-        struct net_device *dev = (struct net_device *) dev_instance;
+        struct net_device *dev = dev_instance;
         struct rtl8169_private *tp = netdev_priv(dev);
         int boguscnt = max_interrupt_work;
         void __iomem *ioaddr = tp->mmio_addr;
@@ -2637,9 +2741,17 @@ rtl8169_interrupt(int irq, void *dev_instance)
                 RTL_W16(IntrStatus,
                         (status & RxFIFOOver) ? (status | RxOverflow) : status);
 
-                if (!(status & rtl8169_intr_mask))
+                if (!(status & tp->intr_event))
                         break;
 
+                /* Work around for rx fifo overflow */
+                if (unlikely(status & RxFIFOOver) &&
+                    (tp->mac_version == RTL_GIGA_MAC_VER_11)) {
+                        netif_stop_queue(dev);
+                        rtl8169_tx_timeout(dev);
+                        break;
+                }
+
                 if (unlikely(status & SYSErr)) {
                         rtl8169_pcierr_interrupt(dev);
                         break;
@@ -2649,8 +2761,8 @@ rtl8169_interrupt(int irq, void *dev_instance)
                         rtl8169_check_link_status(dev, tp, ioaddr);
 
 #ifdef CONFIG_R8169_NAPI
-                RTL_W16(IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event);
-                tp->intr_mask = ~rtl8169_napi_event;
+                RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
+                tp->intr_mask = ~tp->napi_event;
 
                 if (likely(netif_rx_schedule_prep(dev)))
                         __netif_rx_schedule(dev);
@@ -2661,9 +2773,9 @@ rtl8169_interrupt(int irq, void *dev_instance)
                 break;
 #else
                 /* Rx interrupt */
-                if (status & (RxOK | RxOverflow | RxFIFOOver)) {
+                if (status & (RxOK | RxOverflow | RxFIFOOver))
                         rtl8169_rx_interrupt(dev, tp, ioaddr);
-                }
+
                 /* Tx interrupt */
                 if (status & (TxOK | TxErr))
                         rtl8169_tx_interrupt(dev, tp, ioaddr);
@@ -2707,7 +2819,7 @@ static int rtl8169_poll(struct net_device *dev, int *budget)
                  * write is safe - FR
                  */
                 smp_wmb();
-                RTL_W16(IntrMask, rtl8169_intr_mask);
+                RTL_W16(IntrMask, tp->intr_event);
         }
 
         return (work_done >= work_to_do);
@@ -2789,14 +2901,13 @@ static int rtl8169_close(struct net_device *dev)
         return 0;
 }
 
-static void
-rtl8169_set_rx_mode(struct net_device *dev)
+static void rtl_set_rx_mode(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
         unsigned long flags;
         u32 mc_filter[2];       /* Multicast hash filter */
-        int i, rx_mode;
+        int rx_mode;
         u32 tmp = 0;
 
         if (dev->flags & IFF_PROMISC) {
@@ -2816,6 +2927,8 @@ rtl8169_set_rx_mode(struct net_device *dev)
                 mc_filter[1] = mc_filter[0] = 0xffffffff;
         } else {
                 struct dev_mc_list *mclist;
+                unsigned int i;
+
                 rx_mode = AcceptBroadcast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0;
                 for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
@@ -2840,10 +2953,11 @@ rtl8169_set_rx_mode(struct net_device *dev)
                 mc_filter[1] = 0xffffffff;
         }
 
-        RTL_W32(RxConfig, tmp);
         RTL_W32(MAR0 + 0, mc_filter[0]);
         RTL_W32(MAR0 + 4, mc_filter[1]);
 
+        RTL_W32(RxConfig, tmp);
+
         spin_unlock_irqrestore(&tp->lock, flags);
 }
 
@@ -2931,14 +3045,12 @@ static struct pci_driver rtl8169_pci_driver = {
 #endif
 };
 
-static int __init
-rtl8169_init_module(void)
+static int __init rtl8169_init_module(void)
 {
         return pci_register_driver(&rtl8169_pci_driver);
 }
 
-static void __exit
-rtl8169_cleanup_module(void)
+static void __exit rtl8169_cleanup_module(void)
 {
         pci_unregister_driver(&rtl8169_pci_driver);
 }
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 09078ff84cd2..2d826fff7e2e 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -469,11 +469,18 @@ static struct pci_device_id s2io_tbl[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(pci, s2io_tbl);
 
+static struct pci_error_handlers s2io_err_handler = {
+        .error_detected = s2io_io_error_detected,
+        .slot_reset = s2io_io_slot_reset,
+        .resume = s2io_io_resume,
+};
+
 static struct pci_driver s2io_driver = {
       .name = "S2IO",
       .id_table = s2io_tbl,
       .probe = s2io_init_nic,
       .remove = __devexit_p(s2io_rem_nic),
+      .err_handler = &s2io_err_handler,
 };
 
 /* A simplifier macro used both by init and free shared_mem Fns(). */
@@ -2689,6 +2696,9 @@ static void s2io_netpoll(struct net_device *dev)
         u64 val64 = 0xFFFFFFFFFFFFFFFFULL;
         int i;
 
+        if (pci_channel_offline(nic->pdev))
+                return;
+
         disable_irq(dev->irq);
 
         atomic_inc(&nic->isr_cnt);
@@ -3215,6 +3225,8 @@ static void alarm_intr_handler(struct s2io_nic *nic)
         int i;
         if (atomic_read(&nic->card_state) == CARD_DOWN)
                 return;
+        if (pci_channel_offline(nic->pdev))
+                return;
         nic->mac_control.stats_info->sw_stat.ring_full_cnt = 0;
         /* Handling the XPAK counters update */
         if(nic->mac_control.stats_info->xpak_stat.xpak_timer_count < 72000) {
@@ -3958,7 +3970,6 @@ static int s2io_close(struct net_device *dev)
         /* Reset card, kill tasklet and free Tx and Rx buffers. */
         s2io_card_down(sp);
 
-        sp->device_close_flag = TRUE;   /* Device is shut down. */
         return 0;
 }
 
@@ -4314,6 +4325,10 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
         struct mac_info *mac_control;
         struct config_param *config;
 
+        /* Pretend we handled any irq's from a disconnected card */
+        if (pci_channel_offline(sp->pdev))
+                return IRQ_NONE;
+
         atomic_inc(&sp->isr_cnt);
         mac_control = &sp->mac_control;
         config = &sp->config;
@@ -6569,7 +6584,7 @@ static void s2io_rem_isr(struct s2io_nic * sp)
         } while(cnt < 5);
 }
 
-static void s2io_card_down(struct s2io_nic * sp)
+static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
 {
         int cnt = 0;
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
@@ -6584,7 +6599,8 @@ static void s2io_card_down(struct s2io_nic * sp)
         atomic_set(&sp->card_state, CARD_DOWN);
 
         /* disable Tx and Rx traffic on the NIC */
-        stop_nic(sp);
+        if (do_io)
+                stop_nic(sp);
 
         s2io_rem_isr(sp);
 
@@ -6592,7 +6608,7 @@ static void s2io_card_down(struct s2io_nic * sp)
         tasklet_kill(&sp->task);
 
         /* Check if the device is Quiescent and then Reset the NIC */
-        do {
+        while(do_io) {
                 /* As per the HW requirement we need to replenish the
                  * receive buffer to avoid the ring bump. Since there is
                  * no intention of processing the Rx frame at this pointwe are
@@ -6617,8 +6633,9 @@ static void s2io_card_down(struct s2io_nic * sp)
                                   (unsigned long long) val64);
                         break;
                 }
-        } while (1);
-        s2io_reset(sp);
+        }
+        if (do_io)
+                s2io_reset(sp);
 
         spin_lock_irqsave(&sp->tx_lock, flags);
         /* Free all Tx buffers */
@@ -6633,6 +6650,11 @@ static void s2io_card_down(struct s2io_nic * sp)
         clear_bit(0, &(sp->link_state));
 }
 
+static void s2io_card_down(struct s2io_nic * sp)
+{
+        do_s2io_card_down(sp, 1);
+}
+
 static int s2io_card_up(struct s2io_nic * sp)
 {
         int i, ret = 0;
@@ -8010,3 +8032,85 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
         sp->mac_control.stats_info->sw_stat.clubbed_frms_cnt++;
         return;
 }
+
+/**
+ * s2io_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci conneection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
+                                               pci_channel_state_t state)
+{
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct s2io_nic *sp = netdev->priv;
+
+        netif_device_detach(netdev);
+
+        if (netif_running(netdev)) {
+                /* Bring down the card, while avoiding PCI I/O */
+                do_s2io_card_down(sp, 0);
+        }
+        pci_disable_device(pdev);
+
+        return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * s2io_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot.
+ * At this point, the card has exprienced a hard reset,
+ * followed by fixups by BIOS, and has its config space
+ * set up identically to what it was at cold boot.
+ */
+static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev)
+{
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct s2io_nic *sp = netdev->priv;
+
+        if (pci_enable_device(pdev)) {
+                printk(KERN_ERR "s2io: "
+                       "Cannot re-enable PCI device after reset.\n");
+                return PCI_ERS_RESULT_DISCONNECT;
+        }
+
+        pci_set_master(pdev);
+        s2io_reset(sp);
+
+        return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * s2io_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells
+ * us that its OK to resume normal operation.
+ */
+static void s2io_io_resume(struct pci_dev *pdev)
+{
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct s2io_nic *sp = netdev->priv;
+
+        if (netif_running(netdev)) {
+                if (s2io_card_up(sp)) {
+                        printk(KERN_ERR "s2io: "
+                               "Can't bring device back up after reset.\n");
+                        return;
+                }
+
+                if (s2io_set_mac_addr(netdev, netdev->dev_addr) == FAILURE) {
+                        s2io_card_down(sp);
+                        printk(KERN_ERR "s2io: "
+                               "Can't resetore mac addr after reset.\n");
+                        return;
+                }
+        }
+
+        netif_device_attach(netdev);
+        netif_wake_queue(netdev);
+}
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 54baa0b8ec7c..58592780f519 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -794,7 +794,6 @@ struct s2io_nic {
 
         struct net_device_stats stats;
         int high_dma_flag;
-        int device_close_flag;
         int device_enabled_once;
 
         char name[60];
@@ -1052,6 +1051,11 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
                            struct sk_buff *skb, u32 tcp_len);
 static int rts_ds_steer(struct s2io_nic *nic, u8 ds_codepoint, u8 ring);
 
+static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
+                                              pci_channel_state_t state);
+static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev);
+static void s2io_io_resume(struct pci_dev *pdev);
+
 #define s2io_tcp_mss(skb) skb_shinfo(skb)->gso_size
 #define s2io_udp_mss(skb) skb_shinfo(skb)->gso_size
 #define s2io_offload_type(skb) skb_shinfo(skb)->gso_type
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index fe01b961b597..b51d73c8f817 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -50,7 +50,7 @@
 #include "sky2.h"
 
 #define DRV_NAME                "sky2"
-#define DRV_VERSION             "1.14"
+#define DRV_VERSION             "1.15"
 #define PFX                     DRV_NAME " "
 
 /*
@@ -130,7 +130,7 @@ static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) }, /* 88EC034 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4369) }, /* 88EC042 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x436A) }, /* 88E8058 */
-//      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x436B) }, /* 88E8071 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x436B) }, /* 88E8071 */
         { 0 }
 };
 
@@ -217,13 +217,24 @@ static void sky2_power_on(struct sky2_hw *hw)
                 sky2_write8(hw, B2_Y2_CLK_GATE, 0);
 
         if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX) {
-                u32 reg1;
+                u32 reg;
 
-                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
-                reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);
-                reg1 &= P_ASPM_CONTROL_MSK;
-                sky2_pci_write32(hw, PCI_DEV_REG4, reg1);
-                sky2_pci_write32(hw, PCI_DEV_REG5, 0);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG4);
+                /* set all bits to 0 except bits 15..12 and 8 */
+                reg &= P_ASPM_CONTROL_MSK;
+                sky2_pci_write32(hw, PCI_DEV_REG4, reg);
+
+                reg = sky2_pci_read32(hw, PCI_DEV_REG5);
+                /* set all bits to 0 except bits 28 & 27 */
+                reg &= P_CTL_TIM_VMAIN_AV_MSK;
+                sky2_pci_write32(hw, PCI_DEV_REG5, reg);
+
+                sky2_pci_write32(hw, PCI_CFG_REG_1, 0);
+
+                /* Enable workaround for dev 4.107 on Yukon-Ultra & Extreme */
+                reg = sky2_read32(hw, B2_GP_IO);
+                reg |= GLB_GPIO_STAT_RACE_DIS;
+                sky2_write32(hw, B2_GP_IO, reg);
         }
 }
 
@@ -650,6 +661,30 @@ static void sky2_wol_init(struct sky2_port *sky2)
 
 }
 
+static void sky2_set_tx_stfwd(struct sky2_hw *hw, unsigned port)
+{
+        if (hw->chip_id == CHIP_ID_YUKON_EX && hw->chip_rev != CHIP_REV_YU_EX_A0) {
+                sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
+                             TX_STFW_ENA |
+                             (hw->dev[port]->mtu > ETH_DATA_LEN) ? TX_JUMBO_ENA : TX_JUMBO_DIS);
+        } else {
+                if (hw->dev[port]->mtu > ETH_DATA_LEN) {
+                        /* set Tx GMAC FIFO Almost Empty Threshold */
+                        sky2_write32(hw, SK_REG(port, TX_GMF_AE_THR),
+                                     (ECU_JUMBO_WM << 16) | ECU_AE_THR);
+
+                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
+                                     TX_JUMBO_ENA | TX_STFW_DIS);
+
+                        /* Can't do offload because of lack of store/forward */
+                        hw->dev[port]->features &= ~(NETIF_F_TSO | NETIF_F_SG
+                                                     | NETIF_F_ALL_CSUM);
+                } else
+                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
+                                     TX_JUMBO_DIS | TX_STFW_ENA);
+        }
+}
+
 static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 {
         struct sky2_port *sky2 = netdev_priv(hw->dev[port]);
@@ -730,8 +765,11 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 
         /* Configure Rx MAC FIFO */
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
-        sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T),
-                     GMF_OPER_ON | GMF_RX_F_FL_ON);
+        reg = GMF_OPER_ON | GMF_RX_F_FL_ON;
+        if (hw->chip_id == CHIP_ID_YUKON_EX)
+                reg |= GMF_RX_OVER_ON;
+
+        sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), reg);
 
         /* Flush Rx MAC FIFO on any flow control or error */
         sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);
@@ -747,16 +785,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
                 sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);
                 sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);
 
-                /* set Tx GMAC FIFO Almost Empty Threshold */
-                sky2_write32(hw, SK_REG(port, TX_GMF_AE_THR),
-                             (ECU_JUMBO_WM << 16) | ECU_AE_THR);
-
-                if (hw->dev[port]->mtu > ETH_DATA_LEN)
-                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                                     TX_JUMBO_ENA | TX_STFW_DIS);
-                else
-                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                                     TX_JUMBO_DIS | TX_STFW_ENA);
+                sky2_set_tx_stfwd(hw, port);
         }
 
 }
@@ -939,14 +968,16 @@ static void rx_set_checksum(struct sky2_port *sky2)
 {
         struct sky2_rx_le *le;
 
-        le = sky2_next_rx(sky2);
-        le->addr = cpu_to_le32((ETH_HLEN << 16) | ETH_HLEN);
-        le->ctrl = 0;
-        le->opcode = OP_TCPSTART | HW_OWNER;
+        if (sky2->hw->chip_id != CHIP_ID_YUKON_EX) {
+                le = sky2_next_rx(sky2);
+                le->addr = cpu_to_le32((ETH_HLEN << 16) | ETH_HLEN);
+                le->ctrl = 0;
+                le->opcode = OP_TCPSTART | HW_OWNER;
 
-        sky2_write32(sky2->hw,
-                     Q_ADDR(rxqaddr[sky2->port], Q_CSR),
-                     sky2->rx_csum ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
+                sky2_write32(sky2->hw,
+                             Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                             sky2->rx_csum ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
+        }
 
 }
 
@@ -1134,7 +1165,7 @@ static int sky2_rx_start(struct sky2_port *sky2)
         if (hw->chip_id == CHIP_ID_YUKON_EC_U &&
             (hw->chip_rev == CHIP_REV_YU_EC_U_A1
              || hw->chip_rev == CHIP_REV_YU_EC_U_B0))
-                sky2_write32(hw, Q_ADDR(rxq, Q_F), F_M_RX_RAM_DIS);
+                sky2_write32(hw, Q_ADDR(rxq, Q_TEST), F_M_RX_RAM_DIS);
 
         sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1);
 
@@ -1285,6 +1316,10 @@ static int sky2_up(struct net_device *dev)
 
         sky2_qset(hw, txqaddr[port]);
 
+        /* This is copied from sk98lin 10.0.5.3; no one tells me about erratta's */
+        if (hw->chip_id == CHIP_ID_YUKON_EX && hw->chip_rev == CHIP_REV_YU_EX_B0)
+                sky2_write32(hw, Q_ADDR(txqaddr[port], Q_TEST), F_TX_CHK_AUTO_OFF);
+
         /* Set almost empty threshold */
         if (hw->chip_id == CHIP_ID_YUKON_EC_U
             && hw->chip_rev == CHIP_REV_YU_EC_U_A0)
@@ -1393,14 +1428,16 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
         /* Check for TCP Segmentation Offload */
         mss = skb_shinfo(skb)->gso_size;
         if (mss != 0) {
-                mss += tcp_optlen(skb); /* TCP options */
-                mss += ip_hdrlen(skb) + sizeof(struct tcphdr);
-                mss += ETH_HLEN;
-
-                if (mss != sky2->tx_last_mss) {
-                        le = get_tx_le(sky2);
-                        le->addr = cpu_to_le32(mss);
-                        le->opcode = OP_LRGLEN | HW_OWNER;
+                if (hw->chip_id != CHIP_ID_YUKON_EX)
+                        mss += ETH_HLEN + ip_hdrlen(skb) + tcp_hdrlen(skb);
+
+                if (mss != sky2->tx_last_mss) {
+                        le = get_tx_le(sky2);
+                        le->addr = cpu_to_le32(mss);
+                        if (hw->chip_id == CHIP_ID_YUKON_EX)
+                                le->opcode = OP_MSS | HW_OWNER;
+                        else
+                                le->opcode = OP_LRGLEN | HW_OWNER;
                         sky2->tx_last_mss = mss;
                 }
         }
@@ -1422,24 +1459,30 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 
         /* Handle TCP checksum offload */
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const unsigned offset = skb_transport_offset(skb);
-                u32 tcpsum;
-
-                tcpsum = offset << 16;          /* sum start */
-                tcpsum |= offset + skb->csum_offset;    /* sum write */
-
-                ctrl |= CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
-                if (ip_hdr(skb)->protocol == IPPROTO_UDP)
-                        ctrl |= UDPTCP;
-
-                if (tcpsum != sky2->tx_tcpsum) {
-                        sky2->tx_tcpsum = tcpsum;
-
-                        le = get_tx_le(sky2);
-                        le->addr = cpu_to_le32(tcpsum);
-                        le->length = 0; /* initial checksum value */
-                        le->ctrl = 1;   /* one packet */
-                        le->opcode = OP_TCPLISW | HW_OWNER;
+                /* On Yukon EX (some versions) encoding change. */
+                if (hw->chip_id == CHIP_ID_YUKON_EX
+                    && hw->chip_rev != CHIP_REV_YU_EX_B0)
+                        ctrl |= CALSUM; /* auto checksum */
+                else {
+                        const unsigned offset = skb_transport_offset(skb);
+                        u32 tcpsum;
+
+                        tcpsum = offset << 16;                  /* sum start */
+                        tcpsum |= offset + skb->csum_offset;    /* sum write */
+
+                        ctrl |= CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
+                        if (ip_hdr(skb)->protocol == IPPROTO_UDP)
+                                ctrl |= UDPTCP;
+
+                        if (tcpsum != sky2->tx_tcpsum) {
+                                sky2->tx_tcpsum = tcpsum;
+
+                                le = get_tx_le(sky2);
+                                le->addr = cpu_to_le32(tcpsum);
+                                le->length = 0; /* initial checksum value */
+                                le->ctrl = 1;   /* one packet */
+                                le->opcode = OP_TCPLISW | HW_OWNER;
+                        }
                 }
         }
 
@@ -1913,15 +1956,8 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
 
         synchronize_irq(hw->pdev->irq);
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX) {
-                if (new_mtu > ETH_DATA_LEN) {
-                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                                     TX_JUMBO_ENA | TX_STFW_DIS);
-                        dev->features &= NETIF_F_TSO | NETIF_F_SG | NETIF_F_IP_CSUM;
-                } else
-                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                                     TX_JUMBO_DIS | TX_STFW_ENA);
-        }
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX)
+                sky2_set_tx_stfwd(hw, port);
 
         ctl = gma_read16(hw, port, GM_GP_CTRL);
         gma_write16(hw, port, GM_GP_CTRL, ctl & ~GM_GPCR_RX_ENA);
@@ -2118,6 +2154,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
 
         while (hw->st_idx != hwidx) {
                 struct sky2_status_le *le  = hw->st_le + hw->st_idx;
+                unsigned port = le->css & CSS_LINK_BIT;
                 struct net_device *dev;
                 struct sk_buff *skb;
                 u32 status;
@@ -2125,9 +2162,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
 
                 hw->st_idx = RING_NEXT(hw->st_idx, STATUS_RING_SIZE);
 
-                BUG_ON(le->link >= 2);
-                dev = hw->dev[le->link];
-
+                dev = hw->dev[port];
                 sky2 = netdev_priv(dev);
                 length = le16_to_cpu(le->length);
                 status = le32_to_cpu(le->status);
@@ -2140,6 +2175,16 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
                                 goto force_update;
                         }
 
+                        /* This chip reports checksum status differently */
+                        if (hw->chip_id == CHIP_ID_YUKON_EX) {
+                                if (sky2->rx_csum &&
+                                    (le->css & (CSS_ISIPV4 | CSS_ISIPV6)) &&
+                                    (le->css & CSS_TCPUDPCSOK))
+                                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                                else
+                                        skb->ip_summed = CHECKSUM_NONE;
+                        }
+
                         skb->protocol = eth_type_trans(skb, dev);
                         sky2->net_stats.rx_packets++;
                         sky2->net_stats.rx_bytes += skb->len;
@@ -2155,10 +2200,10 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
                                 netif_receive_skb(skb);
 
                         /* Update receiver after 16 frames */
-                        if (++buf_write[le->link] == RX_BUF_WRITE) {
+                        if (++buf_write[port] == RX_BUF_WRITE) {
 force_update:
-                                sky2_put_idx(hw, rxqaddr[le->link], sky2->rx_put);
-                                buf_write[le->link] = 0;
+                                sky2_put_idx(hw, rxqaddr[port], sky2->rx_put);
+                                buf_write[port] = 0;
                         }
 
                         /* Stop after net poll weight */
@@ -2179,6 +2224,9 @@ force_update:
                         if (!sky2->rx_csum)
                                 break;
 
+                        if (hw->chip_id == CHIP_ID_YUKON_EX)
+                                break;
+
                         /* Both checksum counters are programmed to start at
                          * the same offset, so unless there is a problem they
                          * should match. This failure is an early indication that
@@ -2194,7 +2242,7 @@ force_update:
                                        dev->name, status);
                                 sky2->rx_csum = 0;
                                 sky2_write32(sky2->hw,
-                                             Q_ADDR(rxqaddr[le->link], Q_CSR),
+                                             Q_ADDR(rxqaddr[port], Q_CSR),
                                              BMU_DIS_RX_CHKSUM);
                         }
                         break;
@@ -2513,6 +2561,9 @@ static int __devinit sky2_init(struct sky2_hw *hw)
 {
         u8 t8;
 
+        /* Enable all clocks */
+        sky2_pci_write32(hw, PCI_DEV_REG3, 0);
+
         sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
         hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
@@ -2522,14 +2573,6 @@ static int __devinit sky2_init(struct sky2_hw *hw)
                 return -EOPNOTSUPP;
         }
 
-        if (hw->chip_id == CHIP_ID_YUKON_EX)
-                dev_warn(&hw->pdev->dev, "this driver not yet tested on this chip type\n"
-                         "Please report success or failure to <netdev@vger.kernel.org>\n");
-
-        /* Make sure and enable all clocks */
-        if (hw->chip_id == CHIP_ID_YUKON_EX || hw->chip_id == CHIP_ID_YUKON_EC_U)
-                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
-
         hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;
 
         /* This rev is really old, and requires untested workarounds */
@@ -2589,6 +2632,11 @@ static void sky2_reset(struct sky2_hw *hw)
         for (i = 0; i < hw->ports; i++) {
                 sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
                 sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
+
+                if (hw->chip_id == CHIP_ID_YUKON_EX)
+                        sky2_write16(hw, SK_REG(i, GMAC_CTRL),
+                                     GMC_BYP_MACSECRX_ON | GMC_BYP_MACSECTX_ON
+                                     | GMC_BYP_RETR_ON);
         }
 
         sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
@@ -2735,7 +2783,7 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 
         sky2->wol = wol->wolopts;
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U)
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX)
                 sky2_write32(hw, B0_CTST, sky2->wol
                              ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);
 
@@ -3330,7 +3378,7 @@ static int sky2_get_regs_len(struct net_device *dev)
 
 /*
  * Returns copy of control register region
- * Note: access to the RAM address register set will cause timeouts.
+ * Note: ethtool_get_regs always provides full size (16k) buffer
  */
 static void sky2_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                           void *p)
@@ -3338,15 +3386,19 @@ static void sky2_get_regs(struct net_device *dev, struct ethtool_regs *regs,
         const struct sky2_port *sky2 = netdev_priv(dev);
         const void __iomem *io = sky2->hw->regs;
 
-        BUG_ON(regs->len < B3_RI_WTO_R1);
         regs->version = 1;
         memset(p, 0, regs->len);
 
         memcpy_fromio(p, io, B3_RAM_ADDR);
 
-        memcpy_fromio(p + B3_RI_WTO_R1,
-                      io + B3_RI_WTO_R1,
-                      regs->len - B3_RI_WTO_R1);
+        /* skip diagnostic ram region */
+        memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1, 0x2000 - B3_RI_WTO_R1);
+
+        /* copy GMAC registers */
+        memcpy_fromio(p + BASE_GMAC_1, io + BASE_GMAC_1, 0x1000);
+        if (sky2->hw->ports > 1)
+                memcpy_fromio(p + BASE_GMAC_2, io + BASE_GMAC_2, 0x1000);
+
 }
 
 /* In order to do Jumbo packets on these chips, need to turn off the
@@ -3357,9 +3409,7 @@ static int no_tx_offload(struct net_device *dev)
         const struct sky2_port *sky2 = netdev_priv(dev);
         const struct sky2_hw *hw = sky2->hw;
 
-        return dev->mtu > ETH_DATA_LEN &&
-                (hw->chip_id == CHIP_ID_YUKON_EX
-                 || hw->chip_id == CHIP_ID_YUKON_EC_U);
+        return dev->mtu > ETH_DATA_LEN && hw->chip_id == CHIP_ID_YUKON_EC_U;
 }
 
 static int sky2_set_tx_csum(struct net_device *dev, u32 data)
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index b8c4a3b5eadf..8df4643493d1 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -14,6 +14,8 @@ enum {
         PCI_DEV_REG3    = 0x80,
         PCI_DEV_REG4    = 0x84,
         PCI_DEV_REG5    = 0x88,
+        PCI_CFG_REG_0   = 0x90,
+        PCI_CFG_REG_1   = 0x94,
 };
 
 enum {
@@ -28,6 +30,7 @@ enum {
 enum pci_dev_reg_1 {
         PCI_Y2_PIG_ENA   = 1<<31, /* Enable Plug-in-Go (YUKON-2) */
         PCI_Y2_DLL_DIS   = 1<<30, /* Disable PCI DLL (YUKON-2) */
+        PCI_SW_PWR_ON_RST= 1<<30, /* SW Power on Reset (Yukon-EX) */
         PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */
         PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */
         PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */
@@ -67,6 +70,80 @@ enum pci_dev_reg_4 {
                                   | P_ASPM_CLKRUN_REQUEST | P_ASPM_INT_FIFO_EMPTY,
 };
 
+/*      PCI_OUR_REG_5           32 bit  Our Register 5 (Yukon-ECU only) */
+enum pci_dev_reg_5 {
+                                        /* Bit 31..27:  for A3 & later */
+        P_CTL_DIV_CORE_CLK_ENA  = 1<<31, /* Divide Core Clock Enable */
+        P_CTL_SRESET_VMAIN_AV   = 1<<30, /* Soft Reset for Vmain_av De-Glitch */
+        P_CTL_BYPASS_VMAIN_AV   = 1<<29, /* Bypass En. for Vmain_av De-Glitch */
+        P_CTL_TIM_VMAIN_AV_MSK  = 3<<27, /* Bit 28..27: Timer Vmain_av Mask */
+                                         /* Bit 26..16: Release Clock on Event */
+        P_REL_PCIE_RST_DE_ASS   = 1<<26, /* PCIe Reset De-Asserted */
+        P_REL_GPHY_REC_PACKET   = 1<<25, /* GPHY Received Packet */
+        P_REL_INT_FIFO_N_EMPTY  = 1<<24, /* Internal FIFO Not Empty */
+        P_REL_MAIN_PWR_AVAIL    = 1<<23, /* Main Power Available */
+        P_REL_CLKRUN_REQ_REL    = 1<<22, /* CLKRUN Request Release */
+        P_REL_PCIE_RESET_ASS    = 1<<21, /* PCIe Reset Asserted */
+        P_REL_PME_ASSERTED      = 1<<20, /* PME Asserted */
+        P_REL_PCIE_EXIT_L1_ST   = 1<<19, /* PCIe Exit L1 State */
+        P_REL_LOADER_NOT_FIN    = 1<<18, /* EPROM Loader Not Finished */
+        P_REL_PCIE_RX_EX_IDLE   = 1<<17, /* PCIe Rx Exit Electrical Idle State */
+        P_REL_GPHY_LINK_UP      = 1<<16, /* GPHY Link Up */
+
+                                        /* Bit 10.. 0: Mask for Gate Clock */
+        P_GAT_PCIE_RST_ASSERTED = 1<<10,/* PCIe Reset Asserted */
+        P_GAT_GPHY_N_REC_PACKET = 1<<9, /* GPHY Not Received Packet */
+        P_GAT_INT_FIFO_EMPTY    = 1<<8, /* Internal FIFO Empty */
+        P_GAT_MAIN_PWR_N_AVAIL  = 1<<7, /* Main Power Not Available */
+        P_GAT_CLKRUN_REQ_REL    = 1<<6, /* CLKRUN Not Requested */
+        P_GAT_PCIE_RESET_ASS    = 1<<5, /* PCIe Reset Asserted */
+        P_GAT_PME_DE_ASSERTED   = 1<<4, /* PME De-Asserted */
+        P_GAT_PCIE_ENTER_L1_ST  = 1<<3, /* PCIe Enter L1 State */
+        P_GAT_LOADER_FINISHED   = 1<<2, /* EPROM Loader Finished */
+        P_GAT_PCIE_RX_EL_IDLE   = 1<<1, /* PCIe Rx Electrical Idle State */
+        P_GAT_GPHY_LINK_DOWN    = 1<<0, /* GPHY Link Down */
+
+        PCIE_OUR5_EVENT_CLK_D3_SET = P_REL_GPHY_REC_PACKET |
+                                     P_REL_INT_FIFO_N_EMPTY |
+                                     P_REL_PCIE_EXIT_L1_ST |
+                                     P_REL_PCIE_RX_EX_IDLE |
+                                     P_GAT_GPHY_N_REC_PACKET |
+                                     P_GAT_INT_FIFO_EMPTY |
+                                     P_GAT_PCIE_ENTER_L1_ST |
+                                     P_GAT_PCIE_RX_EL_IDLE,
+};
+
+#/*     PCI_CFG_REG_1                   32 bit  Config Register 1 (Yukon-Ext only) */
+enum pci_cfg_reg1 {
+        P_CF1_DIS_REL_EVT_RST   = 1<<24, /* Dis. Rel. Event during PCIE reset */
+                                                                                /* Bit 23..21: Release Clock on Event */
+        P_CF1_REL_LDR_NOT_FIN   = 1<<23, /* EEPROM Loader Not Finished */
+        P_CF1_REL_VMAIN_AVLBL   = 1<<22, /* Vmain available */
+        P_CF1_REL_PCIE_RESET    = 1<<21, /* PCI-E reset */
+                                                                                /* Bit 20..18: Gate Clock on Event */
+        P_CF1_GAT_LDR_NOT_FIN   = 1<<20, /* EEPROM Loader Finished */
+        P_CF1_GAT_PCIE_RX_IDLE  = 1<<19, /* PCI-E Rx Electrical idle */
+        P_CF1_GAT_PCIE_RESET    = 1<<18, /* PCI-E Reset */
+        P_CF1_PRST_PHY_CLKREQ   = 1<<17, /* Enable PCI-E rst & PM2PHY gen. CLKREQ */
+        P_CF1_PCIE_RST_CLKREQ   = 1<<16, /* Enable PCI-E rst generate CLKREQ */
+
+        P_CF1_ENA_CFG_LDR_DONE  = 1<<8, /* Enable core level Config loader done */
+
+        P_CF1_ENA_TXBMU_RD_IDLE = 1<<1, /* Enable TX BMU Read  IDLE for ASPM */
+        P_CF1_ENA_TXBMU_WR_IDLE = 1<<0, /* Enable TX BMU Write IDLE for ASPM */
+
+        PCIE_CFG1_EVENT_CLK_D3_SET = P_CF1_DIS_REL_EVT_RST |
+                                        P_CF1_REL_LDR_NOT_FIN |
+                                        P_CF1_REL_VMAIN_AVLBL |
+                                        P_CF1_REL_PCIE_RESET |
+                                        P_CF1_GAT_LDR_NOT_FIN |
+                                        P_CF1_GAT_PCIE_RESET |
+                                        P_CF1_PRST_PHY_CLKREQ |
+                                        P_CF1_ENA_CFG_LDR_DONE |
+                                        P_CF1_ENA_TXBMU_RD_IDLE |
+                                        P_CF1_ENA_TXBMU_WR_IDLE,
+};
+
 
 #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
                                PCI_STATUS_SIG_SYSTEM_ERROR | \
@@ -364,6 +441,20 @@ enum {
         TST_CFG_WRITE_OFF= 1<<0, /* Disable Config Reg WR */
 };
 
+/*      B2_GPIO */
+enum {
+        GLB_GPIO_CLK_DEB_ENA = 1<<31,   /* Clock Debug Enable */
+        GLB_GPIO_CLK_DBG_MSK = 0xf<<26, /* Clock Debug */
+
+        GLB_GPIO_INT_RST_D3_DIS = 1<<15, /* Disable Internal Reset After D3 to D0 */
+        GLB_GPIO_LED_PAD_SPEED_UP = 1<<14, /* LED PAD Speed Up */
+        GLB_GPIO_STAT_RACE_DIS  = 1<<13, /* Status Race Disable */
+        GLB_GPIO_TEST_SEL_MSK   = 3<<11, /* Testmode Select */
+        GLB_GPIO_TEST_SEL_BASE  = 1<<11,
+        GLB_GPIO_RAND_ENA       = 1<<10, /* Random Enable */
+        GLB_GPIO_RAND_BIT_1     = 1<<9,  /* Random Bit 1 */
+};
+
 /*      B2_MAC_CFG               8 bit  MAC Configuration / Chip Revision */
 enum {
         CFG_CHIP_R_MSK    = 0xf<<4,     /* Bit 7.. 4: Chip Revision */
@@ -392,6 +483,11 @@ enum {
         CHIP_REV_YU_FE_A2    = 2,
 
 };
+enum yukon_ex_rev {
+        CHIP_REV_YU_EX_A0    = 1,
+        CHIP_REV_YU_EX_B0    = 2,
+};
+
 
 /*      B2_Y2_CLK_GATE   8 bit  Clock Gating (Yukon-2 only) */
 enum {
@@ -515,23 +611,15 @@ enum {
 enum {
         B8_Q_REGS = 0x0400, /* base of Queue registers */
         Q_D     = 0x00, /* 8*32 bit     Current Descriptor */
-        Q_DA_L  = 0x20, /* 32 bit       Current Descriptor Address Low dWord */
-        Q_DA_H  = 0x24, /* 32 bit       Current Descriptor Address High dWord */
+        Q_VLAN  = 0x20, /* 16 bit       Current VLAN Tag */
+        Q_DONE  = 0x24, /* 16 bit       Done Index */
         Q_AC_L  = 0x28, /* 32 bit       Current Address Counter Low dWord */
         Q_AC_H  = 0x2c, /* 32 bit       Current Address Counter High dWord */
         Q_BC    = 0x30, /* 32 bit       Current Byte Counter */
         Q_CSR   = 0x34, /* 32 bit       BMU Control/Status Register */
-        Q_F     = 0x38, /* 32 bit       Flag Register */
-        Q_T1    = 0x3c, /* 32 bit       Test Register 1 */
-        Q_T1_TR = 0x3c, /*  8 bit       Test Register 1 Transfer SM */
-        Q_T1_WR = 0x3d, /*  8 bit       Test Register 1 Write Descriptor SM */
-        Q_T1_RD = 0x3e, /*  8 bit       Test Register 1 Read Descriptor SM */
-        Q_T1_SV = 0x3f, /*  8 bit       Test Register 1 Supervisor SM */
-        Q_T2    = 0x40, /* 32 bit       Test Register 2 */
-        Q_T3    = 0x44, /* 32 bit       Test Register 3 */
+        Q_TEST  = 0x38, /* 32 bit       Test/Control Register */
 
 /* Yukon-2 */
-        Q_DONE  = 0x24, /* 16 bit       Done Index              (Yukon-2 only) */
         Q_WM    = 0x40, /* 16 bit       FIFO Watermark */
         Q_AL    = 0x42, /*  8 bit       FIFO Alignment */
         Q_RSP   = 0x44, /* 16 bit       FIFO Read Shadow Pointer */
@@ -545,15 +633,16 @@ enum {
 };
 #define Q_ADDR(reg, offs) (B8_Q_REGS + (reg) + (offs))
 
-/*      Q_F                             32 bit  Flag Register */
+/*      Q_TEST                          32 bit  Test Register */
 enum {
-        F_ALM_FULL      = 1<<27, /* Rx FIFO: almost full */
-        F_EMPTY         = 1<<27, /* Tx FIFO: empty flag */
-        F_FIFO_EOF      = 1<<26, /* Tag (EOF Flag) bit in FIFO */
-        F_WM_REACHED    = 1<<25, /* Watermark reached */
+        /* Transmit */
+        F_TX_CHK_AUTO_OFF = 1<<31, /* Tx checksum auto calc off (Yukon EX) */
+        F_TX_CHK_AUTO_ON  = 1<<30, /* Tx checksum auto calc off (Yukon EX) */
+
+        /* Receive */
         F_M_RX_RAM_DIS  = 1<<24, /* MAC Rx RAM Read Port disable */
-        F_FIFO_LEVEL    = 0x1fL<<16, /* Bit 23..16:     # of Qwords in FIFO */
-        F_WATER_MARK    = 0x0007ffL, /* Bit 10.. 0:     Watermark */
+
+        /* Hardware testbits not used */
 };
 
 /* Queue Prefetch Unit Offsets, use Y2_QADDR() to address (Yukon-2 only)*/
@@ -1608,6 +1697,16 @@ enum {
         RX_VLAN_STRIP_ON = 1<<25,       /* enable  VLAN stripping */
         RX_VLAN_STRIP_OFF = 1<<24,      /* disable VLAN stripping */
 
+        RX_MACSEC_FLUSH_ON  = 1<<23,
+        RX_MACSEC_FLUSH_OFF = 1<<22,
+        RX_MACSEC_ASF_FLUSH_ON = 1<<21,
+        RX_MACSEC_ASF_FLUSH_OFF = 1<<20,
+
+        GMF_RX_OVER_ON      = 1<<19,    /* enable flushing on receive overrun */
+        GMF_RX_OVER_OFF     = 1<<18,    /* disable flushing on receive overrun */
+        GMF_ASF_RX_OVER_ON  = 1<<17,    /* enable flushing of ASF when overrun */
+        GMF_ASF_RX_OVER_OFF = 1<<16,    /* disable flushing of ASF when overrun */
+
         GMF_WP_TST_ON   = 1<<14,        /* Write Pointer Test On */
         GMF_WP_TST_OFF  = 1<<13,        /* Write Pointer Test Off */
         GMF_WP_STEP     = 1<<12,        /* Write Pointer Step/Increment */
@@ -1720,6 +1819,15 @@ enum {
 
 /*      GMAC_CTRL               32 bit  GMAC Control Reg (YUKON only) */
 enum {
+        GMC_SET_RST         = 1<<15,/* MAC SEC RST */
+        GMC_SEC_RST_OFF     = 1<<14,/* MAC SEC RSt OFF */
+        GMC_BYP_MACSECRX_ON = 1<<13,/* Bypass macsec RX */
+        GMC_BYP_MACSECRX_OFF= 1<<12,/* Bypass macsec RX off */
+        GMC_BYP_MACSECTX_ON = 1<<11,/* Bypass macsec TX */
+        GMC_BYP_MACSECTX_OFF= 1<<10,/* Bypass macsec TX  off*/
+        GMC_BYP_RETR_ON = 1<<9, /* Bypass retransmit FIFO On */
+        GMC_BYP_RETR_OFF= 1<<8, /* Bypass retransmit FIFO Off */
+
         GMC_H_BURST_ON  = 1<<7, /* Half Duplex Burst Mode On */
         GMC_H_BURST_OFF = 1<<6, /* Half Duplex Burst Mode Off */
         GMC_F_LOOPB_ON  = 1<<5, /* FIFO Loopback On */
@@ -1805,9 +1913,13 @@ enum {
         OP_ADDR64VLAN   = OP_ADDR64 | OP_VLAN,
         OP_LRGLEN       = 0x24,
         OP_LRGLENVLAN   = OP_LRGLEN | OP_VLAN,
+        OP_MSS          = 0x28,
+        OP_MSSVLAN      = OP_MSS | OP_VLAN,
+
         OP_BUFFER       = 0x40,
         OP_PACKET       = 0x41,
         OP_LARGESEND    = 0x43,
+        OP_LSOV2        = 0x45,
 
 /* YUKON-2 STATUS opcodes defines */
         OP_RXSTAT       = 0x60,
@@ -1818,6 +1930,19 @@ enum {
         OP_RXTIMEVLAN   = OP_RXTIMESTAMP | OP_RXVLAN,
         OP_RSS_HASH     = 0x65,
         OP_TXINDEXLE    = 0x68,
+        OP_MACSEC       = 0x6c,
+        OP_PUTIDX       = 0x70,
+};
+
+enum status_css {
+        CSS_TCPUDPCSOK  = 1<<7, /* TCP / UDP checksum is ok */
+        CSS_ISUDP       = 1<<6, /* packet is a UDP packet */
+        CSS_ISTCP       = 1<<5, /* packet is a TCP packet */
+        CSS_ISIPFRAG    = 1<<4, /* packet is a TCP/UDP frag, CS calc not done */
+        CSS_ISIPV6      = 1<<3, /* packet is a IPv6 packet */
+        CSS_IPV4CSUMOK  = 1<<2, /* IP v4: TCP header checksum is ok */
+        CSS_ISIPV4      = 1<<1, /* packet is a IPv4 packet */
+        CSS_LINK_BIT    = 1<<0, /* port number (legacy) */
 };
 
 /* Yukon 2 hardware interface */
@@ -1838,7 +1963,7 @@ struct sky2_rx_le {
 struct sky2_status_le {
         __le32  status; /* also checksum */
         __le16  length; /* also vlan tag */
-        u8      link;
+        u8      css;
         u8      opcode;
 } __attribute((packed));
 
diff --git a/drivers/net/sni_82596.c b/drivers/net/sni_82596.c
new file mode 100644
index 000000000000..2cf6794acb4f
--- /dev/null
+++ b/drivers/net/sni_82596.c
@@ -0,0 +1,185 @@
+/*
+ * sni_82596.c -- driver for intel 82596 ethernet controller, as
+ *                used in older SNI RM machines
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+
+#define SNI_82596_DRIVER_VERSION "SNI RM 82596 driver - Revision: 0.01"
+
+static const char sni_82596_string[] = "snirm_82596";
+
+#define DMA_ALLOC                      dma_alloc_coherent
+#define DMA_FREE                       dma_free_coherent
+#define DMA_WBACK(priv, addr, len)     do { } while (0)
+#define DMA_INV(priv, addr, len)       do { } while (0)
+#define DMA_WBACK_INV(priv, addr, len) do { } while (0)
+
+#define SYSBUS      0x00004400
+
+/* big endian CPU, 82596 little endian */
+#define SWAP32(x)   cpu_to_le32((u32)(x))
+#define SWAP16(x)   cpu_to_le16((u16)(x))
+
+#define OPT_MPU_16BIT    0x01
+
+#include "lib82596.c"
+
+MODULE_AUTHOR("Thomas Bogendoerfer");
+MODULE_DESCRIPTION("i82596 driver");
+MODULE_LICENSE("GPL");
+module_param(i596_debug, int, 0);
+MODULE_PARM_DESC(i596_debug, "82596 debug mask");
+
+static inline void ca(struct net_device *dev)
+{
+        struct i596_private *lp = netdev_priv(dev);
+
+        writel(0, lp->ca);
+}
+
+
+static void mpu_port(struct net_device *dev, int c, dma_addr_t x)
+{
+        struct i596_private *lp = netdev_priv(dev);
+
+        u32 v = (u32) (c) | (u32) (x);
+
+        if (lp->options & OPT_MPU_16BIT) {
+                writew(v & 0xffff, lp->mpu_port);
+                wmb();  /* order writes to MPU port */
+                udelay(1);
+                writew(v >> 16, lp->mpu_port);
+        } else {
+                writel(v, lp->mpu_port);
+                wmb();  /* order writes to MPU port */
+                udelay(1);
+                writel(v, lp->mpu_port);
+        }
+}
+
+
+static int __devinit sni_82596_probe(struct platform_device *dev)
+{
+        struct  net_device *netdevice;
+        struct i596_private *lp;
+        struct  resource *res, *ca, *idprom, *options;
+        int     retval = -ENOMEM;
+        void __iomem *mpu_addr;
+        void __iomem *ca_addr;
+        u8 __iomem *eth_addr;
+
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        ca = platform_get_resource(dev, IORESOURCE_MEM, 1);
+        options = platform_get_resource(dev, 0, 0);
+        idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);
+        if (!res || !ca || !options || !idprom)
+                return -ENODEV;
+        mpu_addr = ioremap_nocache(res->start, 4);
+        if (!mpu_addr)
+                return -ENOMEM;
+        ca_addr = ioremap_nocache(ca->start, 4);
+        if (!ca_addr)
+                goto probe_failed_free_mpu;
+
+        printk(KERN_INFO "Found i82596 at 0x%x\n", res->start);
+
+        netdevice = alloc_etherdev(sizeof(struct i596_private));
+        if (!netdevice)
+                goto probe_failed_free_ca;
+
+        SET_NETDEV_DEV(netdevice, &dev->dev);
+        platform_set_drvdata (dev, netdevice);
+
+        netdevice->base_addr = res->start;
+        netdevice->irq = platform_get_irq(dev, 0);
+
+        eth_addr = ioremap_nocache(idprom->start, 0x10);
+        if (!eth_addr)
+                goto probe_failed;
+
+        /* someone seems to like messed up stuff */
+        netdevice->dev_addr[0] = readb(eth_addr + 0x0b);
+        netdevice->dev_addr[1] = readb(eth_addr + 0x0a);
+        netdevice->dev_addr[2] = readb(eth_addr + 0x09);
+        netdevice->dev_addr[3] = readb(eth_addr + 0x08);
+        netdevice->dev_addr[4] = readb(eth_addr + 0x07);
+        netdevice->dev_addr[5] = readb(eth_addr + 0x06);
+        iounmap(eth_addr);
+
+        if (!netdevice->irq) {
+                printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
+                        __FILE__, netdevice->base_addr);
+                goto probe_failed;
+        }
+
+        lp = netdev_priv(netdevice);
+        lp->options = options->flags & IORESOURCE_BITS;
+        lp->ca = ca_addr;
+        lp->mpu_port = mpu_addr;
+
+        retval = i82596_probe(netdevice);
+        if (retval == 0)
+                return 0;
+
+probe_failed:
+        free_netdev(netdevice);
+probe_failed_free_ca:
+        iounmap(ca_addr);
+probe_failed_free_mpu:
+        iounmap(mpu_addr);
+        return retval;
+}
+
+static int __devexit sni_82596_driver_remove(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct i596_private *lp = netdev_priv(dev);
+
+        unregister_netdev(dev);
+        DMA_FREE(dev->dev.parent, sizeof(struct i596_private),
+                 lp->dma, lp->dma_addr);
+        iounmap(lp->ca);
+        iounmap(lp->mpu_port);
+        free_netdev (dev);
+        return 0;
+}
+
+static struct platform_driver sni_82596_driver = {
+        .probe  = sni_82596_probe,
+        .remove = __devexit_p(sni_82596_driver_remove),
+        .driver = {
+                .name   = sni_82596_string,
+        },
+};
+
+static int __devinit sni_82596_init(void)
+{
+        printk(KERN_INFO SNI_82596_DRIVER_VERSION "\n");
+        return platform_driver_register(&sni_82596_driver);
+}
+
+
+static void __exit sni_82596_exit(void)
+{
+        platform_driver_unregister(&sni_82596_driver);
+}
+
+module_init(sni_82596_init);
+module_exit(sni_82596_exit);
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 7a4aa6a9f949..f5abb5279d4d 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -434,7 +434,8 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
                                       bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
         if (!descr->skb) {
                 if (netif_msg_rx_err(card) && net_ratelimit())
-                        pr_err("Not enough memory to allocate rx buffer\n");
+                        dev_err(&card->netdev->dev,
+                                "Not enough memory to allocate rx buffer\n");
                 card->spider_stats.alloc_rx_skb_error++;
                 return -ENOMEM;
         }
@@ -455,7 +456,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
                 dev_kfree_skb_any(descr->skb);
                 descr->skb = NULL;
                 if (netif_msg_rx_err(card) && net_ratelimit())
-                        pr_err("Could not iommu-map rx buffer\n");
+                        dev_err(&card->netdev->dev, "Could not iommu-map rx buffer\n");
                 card->spider_stats.rx_iommu_map_error++;
                 hwdescr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE;
         } else {
@@ -500,6 +501,20 @@ spider_net_enable_rxdmac(struct spider_net_card *card)
 }
 
 /**
+ * spider_net_disable_rxdmac - disables the receive DMA controller
+ * @card: card structure
+ *
+ * spider_net_disable_rxdmac terminates processing on the DMA controller
+ * by turing off the DMA controller, with the force-end flag set.
+ */
+static inline void
+spider_net_disable_rxdmac(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_GDADMACCNTR,
+                             SPIDER_NET_DMA_RX_FEND_VALUE);
+}
+
+/**
  * spider_net_refill_rx_chain - refills descriptors/skbs in the rx chains
  * @card: card structure
  *
@@ -655,20 +670,6 @@ write_hash:
 }
 
 /**
- * spider_net_disable_rxdmac - disables the receive DMA controller
- * @card: card structure
- *
- * spider_net_disable_rxdmac terminates processing on the DMA controller by
- * turing off DMA and issueing a force end
- */
-static void
-spider_net_disable_rxdmac(struct spider_net_card *card)
-{
-        spider_net_write_reg(card, SPIDER_NET_GDADMACCNTR,
-                             SPIDER_NET_DMA_RX_FEND_VALUE);
-}
-
-/**
  * spider_net_prepare_tx_descr - fill tx descriptor with skb data
  * @card: card structure
  * @descr: descriptor structure to fill out
@@ -692,7 +693,7 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
         buf = pci_map_single(card->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
         if (pci_dma_mapping_error(buf)) {
                 if (netif_msg_tx_err(card) && net_ratelimit())
-                        pr_err("could not iommu-map packet (%p, %i). "
+                        dev_err(&card->netdev->dev, "could not iommu-map packet (%p, %i). "
                                   "Dropping packet\n", skb->data, skb->len);
                 card->spider_stats.tx_iommu_map_error++;
                 return -ENOMEM;
@@ -715,7 +716,7 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
         hwdescr->data_status = 0;
 
         hwdescr->dmac_cmd_status =
-                        SPIDER_NET_DESCR_CARDOWNED | SPIDER_NET_DMAC_NOCS;
+                        SPIDER_NET_DESCR_CARDOWNED | SPIDER_NET_DMAC_TXFRMTL;
         spin_unlock_irqrestore(&chain->lock, flags);
 
         if (skb->ip_summed == CHECKSUM_PARTIAL)
@@ -832,9 +833,8 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
                 case SPIDER_NET_DESCR_PROTECTION_ERROR:
                 case SPIDER_NET_DESCR_FORCE_END:
                         if (netif_msg_tx_err(card))
-                                pr_err("%s: forcing end of tx descriptor "
-                                       "with status x%02x\n",
-                                       card->netdev->name, status);
+                                dev_err(&card->netdev->dev, "forcing end of tx descriptor "
+                                       "with status x%02x\n", status);
                         card->netdev_stats.tx_errors++;
                         break;
 
@@ -1022,34 +1022,94 @@ spider_net_pass_skb_up(struct spider_net_descr *descr,
         netif_receive_skb(skb);
 }
 
-#ifdef DEBUG
 static void show_rx_chain(struct spider_net_card *card)
 {
         struct spider_net_descr_chain *chain = &card->rx_chain;
         struct spider_net_descr *start= chain->tail;
         struct spider_net_descr *descr= start;
+        struct spider_net_hw_descr *hwd = start->hwdescr;
+        struct device *dev = &card->netdev->dev;
+        u32 curr_desc, next_desc;
         int status;
 
+        int tot = 0;
         int cnt = 0;
-        int cstat = spider_net_get_descr_status(descr);
-        printk(KERN_INFO "RX chain tail at descr=%ld\n",
-             (start - card->descr) - card->tx_chain.num_desc);
+        int off = start - chain->ring;
+        int cstat = hwd->dmac_cmd_status;
+
+        dev_info(dev, "Total number of descrs=%d\n",
+                chain->num_desc);
+        dev_info(dev, "Chain tail located at descr=%d, status=0x%x\n",
+                off, cstat);
+
+        curr_desc = spider_net_read_reg(card, SPIDER_NET_GDACTDPA);
+        next_desc = spider_net_read_reg(card, SPIDER_NET_GDACNEXTDA);
+
         status = cstat;
         do
         {
-                status = spider_net_get_descr_status(descr);
+                hwd = descr->hwdescr;
+                off = descr - chain->ring;
+                status = hwd->dmac_cmd_status;
+
+                if (descr == chain->head)
+                        dev_info(dev, "Chain head is at %d, head status=0x%x\n",
+                                 off, status);
+
+                if (curr_desc == descr->bus_addr)
+                        dev_info(dev, "HW curr desc (GDACTDPA) is at %d, status=0x%x\n",
+                                 off, status);
+
+                if (next_desc == descr->bus_addr)
+                        dev_info(dev, "HW next desc (GDACNEXTDA) is at %d, status=0x%x\n",
+                                 off, status);
+
+                if (hwd->next_descr_addr == 0)
+                        dev_info(dev, "chain is cut at %d\n", off);
+
                 if (cstat != status) {
-                        printk(KERN_INFO "Have %d descrs with stat=x%08x\n", cnt, cstat);
+                        int from = (chain->num_desc + off - cnt) % chain->num_desc;
+                        int to = (chain->num_desc + off - 1) % chain->num_desc;
+                        dev_info(dev, "Have %d (from %d to %d) descrs "
+                                 "with stat=0x%08x\n", cnt, from, to, cstat);
                         cstat = status;
                         cnt = 0;
                 }
+
                 cnt ++;
+                tot ++;
+                descr = descr->next;
+        } while (descr != start);
+
+        dev_info(dev, "Last %d descrs with stat=0x%08x "
+                 "for a total of %d descrs\n", cnt, cstat, tot);
+
+#ifdef DEBUG
+        /* Now dump the whole ring */
+        descr = start;
+        do
+        {
+                struct spider_net_hw_descr *hwd = descr->hwdescr;
+                status = spider_net_get_descr_status(hwd);
+                cnt = descr - chain->ring;
+                dev_info(dev, "Descr %d stat=0x%08x skb=%p\n",
+                         cnt, status, descr->skb);
+                dev_info(dev, "bus addr=%08x buf addr=%08x sz=%d\n",
+                         descr->bus_addr, hwd->buf_addr, hwd->buf_size);
+                dev_info(dev, "next=%08x result sz=%d valid sz=%d\n",
+                         hwd->next_descr_addr, hwd->result_size,
+                         hwd->valid_size);
+                dev_info(dev, "dmac=%08x data stat=%08x data err=%08x\n",
+                         hwd->dmac_cmd_status, hwd->data_status,
+                         hwd->data_error);
+                dev_info(dev, "\n");
+
                 descr = descr->next;
         } while (descr != start);
-        printk(KERN_INFO "Last %d descrs with stat=x%08x\n", cnt, cstat);
-}
 #endif
 
+}
+
 /**
  * spider_net_resync_head_ptr - Advance head ptr past empty descrs
  *
@@ -1127,6 +1187,7 @@ spider_net_decode_one_descr(struct spider_net_card *card)
         struct spider_net_descr_chain *chain = &card->rx_chain;
         struct spider_net_descr *descr = chain->tail;
         struct spider_net_hw_descr *hwdescr = descr->hwdescr;
+        u32 hw_buf_addr;
         int status;
 
         status = spider_net_get_descr_status(hwdescr);
@@ -1140,15 +1201,17 @@ spider_net_decode_one_descr(struct spider_net_card *card)
         chain->tail = descr->next;
 
         /* unmap descriptor */
-        pci_unmap_single(card->pdev, hwdescr->buf_addr,
+        hw_buf_addr = hwdescr->buf_addr;
+        hwdescr->buf_addr = 0xffffffff;
+        pci_unmap_single(card->pdev, hw_buf_addr,
                         SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE);
 
         if ( (status == SPIDER_NET_DESCR_RESPONSE_ERROR) ||
              (status == SPIDER_NET_DESCR_PROTECTION_ERROR) ||
              (status == SPIDER_NET_DESCR_FORCE_END) ) {
                 if (netif_msg_rx_err(card))
-                        pr_err("%s: dropping RX descriptor with state %d\n",
-                               card->netdev->name, status);
+                        dev_err(&card->netdev->dev,
+                               "dropping RX descriptor with state %d\n", status);
                 card->netdev_stats.rx_dropped++;
                 goto bad_desc;
         }
@@ -1156,8 +1219,8 @@ spider_net_decode_one_descr(struct spider_net_card *card)
         if ( (status != SPIDER_NET_DESCR_COMPLETE) &&
              (status != SPIDER_NET_DESCR_FRAME_END) ) {
                 if (netif_msg_rx_err(card))
-                        pr_err("%s: RX descriptor with unknown state %d\n",
-                               card->netdev->name, status);
+                        dev_err(&card->netdev->dev,
+                               "RX descriptor with unknown state %d\n", status);
                 card->spider_stats.rx_desc_unk_state++;
                 goto bad_desc;
         }
@@ -1165,18 +1228,17 @@ spider_net_decode_one_descr(struct spider_net_card *card)
         /* The cases we'll throw away the packet immediately */
         if (hwdescr->data_error & SPIDER_NET_DESTROY_RX_FLAGS) {
                 if (netif_msg_rx_err(card))
-                        pr_err("%s: error in received descriptor found, "
+                        dev_err(&card->netdev->dev,
+                               "error in received descriptor found, "
                                "data_status=x%08x, data_error=x%08x\n",
-                               card->netdev->name,
                                hwdescr->data_status, hwdescr->data_error);
                 goto bad_desc;
         }
 
-        if (hwdescr->dmac_cmd_status & 0xfcf4) {
-                pr_err("%s: bad status, cmd_status=x%08x\n",
-                               card->netdev->name,
+        if (hwdescr->dmac_cmd_status & SPIDER_NET_DESCR_BAD_STATUS) {
+                dev_err(&card->netdev->dev, "bad status, cmd_status=x%08x\n",
                                hwdescr->dmac_cmd_status);
-                pr_err("buf_addr=x%08x\n", hwdescr->buf_addr);
+                pr_err("buf_addr=x%08x\n", hw_buf_addr);
                 pr_err("buf_size=x%08x\n", hwdescr->buf_size);
                 pr_err("next_descr_addr=x%08x\n", hwdescr->next_descr_addr);
                 pr_err("result_size=x%08x\n", hwdescr->result_size);
@@ -1196,6 +1258,8 @@ spider_net_decode_one_descr(struct spider_net_card *card)
         return 1;
 
 bad_desc:
+        if (netif_msg_rx_err(card))
+                show_rx_chain(card);
         dev_kfree_skb_irq(descr->skb);
         descr->skb = NULL;
         hwdescr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE;
@@ -1221,7 +1285,6 @@ spider_net_poll(struct net_device *netdev, int *budget)
         int packets_to_do, packets_done = 0;
         int no_more_packets = 0;
 
-        spider_net_cleanup_tx_ring(card);
         packets_to_do = min(*budget, netdev->quota);
 
         while (packets_to_do) {
@@ -1246,6 +1309,8 @@ spider_net_poll(struct net_device *netdev, int *budget)
         spider_net_refill_rx_chain(card);
         spider_net_enable_rxdmac(card);
 
+        spider_net_cleanup_tx_ring(card);
+
         /* if all packets are in the stack, enable interrupts and return 0 */
         /* if not, return 1 */
         if (no_more_packets) {
@@ -1415,7 +1480,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
         case SPIDER_NET_GPWFFINT:
                 /* PHY command queue full */
                 if (netif_msg_intr(card))
-                        pr_err("PHY write queue full\n");
+                        dev_err(&card->netdev->dev, "PHY write queue full\n");
                 show_error = 0;
                 break;
 
@@ -1582,9 +1647,8 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
         }
 
         if ((show_error) && (netif_msg_intr(card)) && net_ratelimit())
-                pr_err("Got error interrupt on %s, GHIINT0STS = 0x%08x, "
+                dev_err(&card->netdev->dev, "Error interrupt, GHIINT0STS = 0x%08x, "
                        "GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n",
-                       card->netdev->name,
                        status_reg, error_reg1, error_reg2);
 
         /* clear interrupt sources */
@@ -1849,7 +1913,8 @@ spider_net_init_firmware(struct spider_net_card *card)
                              SPIDER_NET_FIRMWARE_NAME, &card->pdev->dev) == 0) {
                 if ( (firmware->size != SPIDER_NET_FIRMWARE_LEN) &&
                      netif_msg_probe(card) ) {
-                        pr_err("Incorrect size of spidernet firmware in " \
+                        dev_err(&card->netdev->dev,
+                               "Incorrect size of spidernet firmware in " \
                                "filesystem. Looking in host firmware...\n");
                         goto try_host_fw;
                 }
@@ -1873,8 +1938,8 @@ try_host_fw:
 
         if ( (fw_size != SPIDER_NET_FIRMWARE_LEN) &&
              netif_msg_probe(card) ) {
-                pr_err("Incorrect size of spidernet firmware in " \
-                       "host firmware\n");
+                dev_err(&card->netdev->dev,
+                       "Incorrect size of spidernet firmware in host firmware\n");
                 goto done;
         }
 
@@ -1884,7 +1949,8 @@ done:
         return err;
 out_err:
         if (netif_msg_probe(card))
-                pr_err("Couldn't find spidernet firmware in filesystem " \
+                dev_err(&card->netdev->dev,
+                       "Couldn't find spidernet firmware in filesystem " \
                        "or host firmware\n");
         return err;
 }
@@ -2279,13 +2345,14 @@ spider_net_setup_netdev(struct spider_net_card *card)
 
         result = spider_net_set_mac(netdev, &addr);
         if ((result) && (netif_msg_probe(card)))
-                pr_err("Failed to set MAC address: %i\n", result);
+                dev_err(&card->netdev->dev,
+                        "Failed to set MAC address: %i\n", result);
 
         result = register_netdev(netdev);
         if (result) {
                 if (netif_msg_probe(card))
-                        pr_err("Couldn't register net_device: %i\n",
-                                  result);
+                        dev_err(&card->netdev->dev,
+                                "Couldn't register net_device: %i\n", result);
                 return result;
         }
 
@@ -2363,17 +2430,19 @@ spider_net_setup_pci_dev(struct pci_dev *pdev)
         unsigned long mmio_start, mmio_len;
 
         if (pci_enable_device(pdev)) {
-                pr_err("Couldn't enable PCI device\n");
+                dev_err(&pdev->dev, "Couldn't enable PCI device\n");
                 return NULL;
         }
 
         if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-                pr_err("Couldn't find proper PCI device base address.\n");
+                dev_err(&pdev->dev,
+                        "Couldn't find proper PCI device base address.\n");
                 goto out_disable_dev;
         }
 
         if (pci_request_regions(pdev, spider_net_driver_name)) {
-                pr_err("Couldn't obtain PCI resources, aborting.\n");
+                dev_err(&pdev->dev,
+                        "Couldn't obtain PCI resources, aborting.\n");
                 goto out_disable_dev;
         }
 
@@ -2381,8 +2450,8 @@ spider_net_setup_pci_dev(struct pci_dev *pdev)
 
         card = spider_net_alloc_card();
         if (!card) {
-                pr_err("Couldn't allocate net_device structure, "
-                          "aborting.\n");
+                dev_err(&pdev->dev,
+                        "Couldn't allocate net_device structure, aborting.\n");
                 goto out_release_regions;
         }
         card->pdev = pdev;
@@ -2396,7 +2465,8 @@ spider_net_setup_pci_dev(struct pci_dev *pdev)
         card->regs = ioremap(mmio_start, mmio_len);
 
         if (!card->regs) {
-                pr_err("Couldn't obtain PCI resources, aborting.\n");
+                dev_err(&pdev->dev,
+                        "Couldn't obtain PCI resources, aborting.\n");
                 goto out_release_regions;
         }
 
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 1d054aa71504..dbbdb8cee3c6 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -349,11 +349,23 @@ enum spider_net_int2_status {
 #define SPIDER_NET_GPRDAT_MASK                  0x0000ffff
 
 #define SPIDER_NET_DMAC_NOINTR_COMPLETE         0x00800000
-#define SPIDER_NET_DMAC_NOCS                    0x00040000
+#define SPIDER_NET_DMAC_TXFRMTL         0x00040000
 #define SPIDER_NET_DMAC_TCP                     0x00020000
 #define SPIDER_NET_DMAC_UDP                     0x00030000
 #define SPIDER_NET_TXDCEST                      0x08000000
 
+#define SPIDER_NET_DESCR_RXFDIS        0x00000001
+#define SPIDER_NET_DESCR_RXDCEIS       0x00000002
+#define SPIDER_NET_DESCR_RXDEN0IS      0x00000004
+#define SPIDER_NET_DESCR_RXINVDIS      0x00000008
+#define SPIDER_NET_DESCR_RXRERRIS      0x00000010
+#define SPIDER_NET_DESCR_RXFDCIMS      0x00000100
+#define SPIDER_NET_DESCR_RXDCEIMS      0x00000200
+#define SPIDER_NET_DESCR_RXDEN0IMS     0x00000400
+#define SPIDER_NET_DESCR_RXINVDIMS     0x00000800
+#define SPIDER_NET_DESCR_RXRERRMIS     0x00001000
+#define SPIDER_NET_DESCR_UNUSED        0x077fe0e0
+
 #define SPIDER_NET_DESCR_IND_PROC_MASK          0xF0000000
 #define SPIDER_NET_DESCR_COMPLETE               0x00000000 /* used in rx and tx */
 #define SPIDER_NET_DESCR_RESPONSE_ERROR         0x10000000 /* used in rx and tx */
@@ -364,6 +376,13 @@ enum spider_net_int2_status {
 #define SPIDER_NET_DESCR_NOT_IN_USE             0xF0000000
 #define SPIDER_NET_DESCR_TXDESFLG               0x00800000
 
+#define SPIDER_NET_DESCR_BAD_STATUS   (SPIDER_NET_DESCR_RXDEN0IS | \
+                                       SPIDER_NET_DESCR_RXRERRIS | \
+                                       SPIDER_NET_DESCR_RXDEN0IMS | \
+                                       SPIDER_NET_DESCR_RXINVDIMS | \
+                                       SPIDER_NET_DESCR_RXRERRMIS | \
+                                       SPIDER_NET_DESCR_UNUSED)
+
 /* Descriptor, as defined by the hardware */
 struct spider_net_hw_descr {
         u32 buf_addr;
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 8c9634a98c11..1c537d5a3062 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -2,17 +2,17 @@
 # Tulip family network device configuration
 #
 
-menu "Tulip family network device support"
-        depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
-
-config NET_TULIP
+menuconfig NET_TULIP
         bool "\"Tulip\" family network device support"
+        depends on PCI || EISA || CARDBUS
         help
           This selects the "Tulip" family of EISA/PCI network cards.
 
+if NET_TULIP
+
 config DE2104X
         tristate "Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)"
-        depends on NET_TULIP && PCI && EXPERIMENTAL
+        depends on PCI && EXPERIMENTAL
         select CRC32
         ---help---
           This driver is developed for the SMC EtherPower series Ethernet
@@ -30,7 +30,7 @@ config DE2104X
 
 config TULIP
         tristate "DECchip Tulip (dc2114x) PCI support"
-        depends on NET_TULIP && PCI
+        depends on PCI
         select CRC32
         ---help---
           This driver is developed for the SMC EtherPower series Ethernet
@@ -95,7 +95,7 @@ config TULIP_NAPI_HW_MITIGATION
 
 config DE4X5
         tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
-        depends on NET_TULIP && (PCI || EISA)
+        depends on PCI || EISA
         select CRC32
         ---help---
           This is support for the DIGITAL series of PCI/EISA Ethernet cards.
@@ -112,7 +112,7 @@ config DE4X5
 
 config WINBOND_840
         tristate "Winbond W89c840 Ethernet support"
-        depends on NET_TULIP && PCI
+        depends on PCI
         select CRC32
         select MII
         help
@@ -123,7 +123,7 @@ config WINBOND_840
 
 config DM9102
         tristate "Davicom DM910x/DM980x support"
-        depends on NET_TULIP && PCI
+        depends on PCI
         select CRC32
         ---help---
           This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
@@ -137,7 +137,7 @@ config DM9102
 
 config ULI526X
         tristate "ULi M526x controller support"
-        depends on NET_TULIP && PCI
+        depends on PCI
         select CRC32
         ---help---
           This driver is for ULi M5261/M5263 10/100M Ethernet Controller
@@ -149,7 +149,7 @@ config ULI526X
           
 config PCMCIA_XIRCOM
         tristate "Xircom CardBus support (new driver)"
-        depends on NET_TULIP && CARDBUS
+        depends on CARDBUS
         ---help---
           This driver is for the Digital "Tulip" Ethernet CardBus adapters.
           It should work with most DEC 21*4*-based chips/ethercards, as well
@@ -162,7 +162,7 @@ config PCMCIA_XIRCOM
 
 config PCMCIA_XIRTULIP
         tristate "Xircom Tulip-like CardBus support (old driver)"
-        depends on NET_TULIP && CARDBUS && BROKEN_ON_SMP
+        depends on CARDBUS && BROKEN_ON_SMP
         select CRC32
         ---help---
           This driver is for the Digital "Tulip" Ethernet CardBus adapters.
@@ -174,5 +174,4 @@ config PCMCIA_XIRTULIP
           <file:Documentation/networking/net-modules.txt>.  The module will
           be called xircom_tulip_cb.  If unsure, say N.
 
-endmenu
-
+endif # NET_TULIP
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 861729806dc1..d380e0b3f05a 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -785,7 +785,6 @@ static void __de_set_rx_mode (struct net_device *dev)
 
         de->tx_head = NEXT_TX(entry);
 
-        BUG_ON(TX_BUFFS_AVAIL(de) < 0);
         if (TX_BUFFS_AVAIL(de) == 0)
                 netif_stop_queue(dev);
 
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 62143f92c231..42fca26afc50 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -597,7 +597,7 @@ static char *args;
 #endif
 
 struct parameters {
-    int fdx;
+    bool fdx;
     int autosense;
 };
 
@@ -809,10 +809,10 @@ struct de4x5_private {
     s32  irq_en;                            /* Summary interrupt bits       */
     int  media;                             /* Media (eg TP), mode (eg 100B)*/
     int  c_media;                           /* Remember the last media conn */
-    int  fdx;                               /* media full duplex flag       */
+    bool fdx;                               /* media full duplex flag       */
     int  linkOK;                            /* Link is OK                   */
     int  autosense;                         /* Allow/disallow autosensing   */
-    int  tx_enable;                         /* Enable descriptor polling    */
+    bool tx_enable;                         /* Enable descriptor polling    */
     int  setup_f;                           /* Setup frame filtering type   */
     int  local_state;                       /* State within a 'media' state */
     struct mii_phy phy[DE4X5_MAX_PHY];      /* List of attached PHY devices */
@@ -838,8 +838,8 @@ struct de4x5_private {
     struct de4x5_srom srom;                 /* A copy of the SROM           */
     int cfrv;                               /* Card CFRV copy */
     int rx_ovf;                             /* Check for 'RX overflow' tag  */
-    int useSROM;                            /* For non-DEC card use SROM    */
-    int useMII;                             /* Infoblock using the MII      */
+    bool useSROM;                           /* For non-DEC card use SROM    */
+    bool useMII;                            /* Infoblock using the MII      */
     int asBitValid;                         /* Autosense bits in GEP?       */
     int asPolarity;                         /* 0 => asserted high           */
     int asBit;                              /* Autosense bit number in GEP  */
@@ -928,7 +928,7 @@ static int     dc21040_state(struct net_device *dev, int csr13, int csr14, int c
 static int     test_media(struct net_device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec);
 static int     test_for_100Mb(struct net_device *dev, int msec);
 static int     wait_for_link(struct net_device *dev);
-static int     test_mii_reg(struct net_device *dev, int reg, int mask, int pol, long msec);
+static int     test_mii_reg(struct net_device *dev, int reg, int mask, bool pol, long msec);
 static int     is_spd_100(struct net_device *dev);
 static int     is_100_up(struct net_device *dev);
 static int     is_10_up(struct net_device *dev);
@@ -1109,7 +1109,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     /*
     ** Now find out what kind of DC21040/DC21041/DC21140 board we have.
     */
-    lp->useSROM = FALSE;
+    lp->useSROM = false;
     if (lp->bus == PCI) {
         PCI_signature(name, lp);
     } else {
@@ -1137,7 +1137,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
         lp->cache.gepc = GEP_INIT;
         lp->asBit = GEP_SLNK;
         lp->asPolarity = GEP_SLNK;
-        lp->asBitValid = TRUE;
+        lp->asBitValid = ~0;
         lp->timeout = -1;
         lp->gendev = gendev;
         spin_lock_init(&lp->lock);
@@ -1463,7 +1463,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
     u_long flags = 0;
 
     netif_stop_queue(dev);
-    if (lp->tx_enable == NO) {                   /* Cannot send for now */
+    if (!lp->tx_enable) {                   /* Cannot send for now */
         return -1;
     }
 
@@ -2424,7 +2424,7 @@ dc21040_autoconf(struct net_device *dev)
     switch (lp->media) {
     case INIT:
         DISABLE_IRQs;
-        lp->tx_enable = NO;
+        lp->tx_enable = false;
         lp->timeout = -1;
         de4x5_save_skbs(dev);
         if ((lp->autosense == AUTO) || (lp->autosense == TP)) {
@@ -2477,7 +2477,7 @@ dc21040_autoconf(struct net_device *dev)
             lp->c_media = lp->media;
         }
         lp->media = INIT;
-        lp->tx_enable = NO;
+        lp->tx_enable = false;
         break;
     }
 
@@ -2578,7 +2578,7 @@ dc21041_autoconf(struct net_device *dev)
     switch (lp->media) {
     case INIT:
         DISABLE_IRQs;
-        lp->tx_enable = NO;
+        lp->tx_enable = false;
         lp->timeout = -1;
         de4x5_save_skbs(dev);          /* Save non transmitted skb's */
         if ((lp->autosense == AUTO) || (lp->autosense == TP_NW)) {
@@ -2757,7 +2757,7 @@ dc21041_autoconf(struct net_device *dev)
             lp->c_media = lp->media;
         }
         lp->media = INIT;
-        lp->tx_enable = NO;
+        lp->tx_enable = false;
         break;
     }
 
@@ -2781,7 +2781,7 @@ dc21140m_autoconf(struct net_device *dev)
     case INIT:
         if (lp->timeout < 0) {
             DISABLE_IRQs;
-            lp->tx_enable = FALSE;
+            lp->tx_enable = false;
             lp->linkOK = 0;
             de4x5_save_skbs(dev);          /* Save non transmitted skb's */
         }
@@ -2830,7 +2830,7 @@ dc21140m_autoconf(struct net_device *dev)
             if (lp->timeout < 0) {
                 mii_wr(MII_CR_ASSE | MII_CR_RAN, MII_CR, lp->phy[lp->active].addr, DE4X5_MII);
             }
-            cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, FALSE, 500);
+            cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, false, 500);
             if (cr < 0) {
                 next_tick = cr & ~TIMER_CB;
             } else {
@@ -2845,7 +2845,7 @@ dc21140m_autoconf(struct net_device *dev)
             break;
 
         case 1:
-            if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, TRUE, 2000)) < 0) {
+            if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, true, 2000)) < 0) {
                 next_tick = sr & ~TIMER_CB;
             } else {
                 lp->media = SPD_DET;
@@ -2857,10 +2857,10 @@ dc21140m_autoconf(struct net_device *dev)
                     if (!(anlpa & MII_ANLPA_RF) &&
                          (cap = anlpa & MII_ANLPA_TAF & ana)) {
                         if (cap & MII_ANA_100M) {
-                            lp->fdx = ((ana & anlpa & MII_ANA_FDAM & MII_ANA_100M) ? TRUE : FALSE);
+                            lp->fdx = (ana & anlpa & MII_ANA_FDAM & MII_ANA_100M) != 0;
                             lp->media = _100Mb;
                         } else if (cap & MII_ANA_10M) {
-                            lp->fdx = ((ana & anlpa & MII_ANA_FDAM & MII_ANA_10M) ? TRUE : FALSE);
+                            lp->fdx = (ana & anlpa & MII_ANA_FDAM & MII_ANA_10M) != 0;
 
                             lp->media = _10Mb;
                         }
@@ -2932,7 +2932,7 @@ dc21140m_autoconf(struct net_device *dev)
             lp->c_media = lp->media;
         }
         lp->media = INIT;
-        lp->tx_enable = FALSE;
+        lp->tx_enable = false;
         break;
     }
 
@@ -2965,7 +2965,7 @@ dc2114x_autoconf(struct net_device *dev)
     case INIT:
         if (lp->timeout < 0) {
             DISABLE_IRQs;
-            lp->tx_enable = FALSE;
+            lp->tx_enable = false;
             lp->linkOK = 0;
             lp->timeout = -1;
             de4x5_save_skbs(dev);            /* Save non transmitted skb's */
@@ -3013,7 +3013,7 @@ dc2114x_autoconf(struct net_device *dev)
             if (lp->timeout < 0) {
                 mii_wr(MII_CR_ASSE | MII_CR_RAN, MII_CR, lp->phy[lp->active].addr, DE4X5_MII);
             }
-            cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, FALSE, 500);
+            cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, false, 500);
             if (cr < 0) {
                 next_tick = cr & ~TIMER_CB;
             } else {
@@ -3028,7 +3028,8 @@ dc2114x_autoconf(struct net_device *dev)
             break;
 
         case 1:
-            if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, TRUE, 2000)) < 0) {
+            sr = test_mii_reg(dev, MII_SR, MII_SR_ASSC, true, 2000);
+            if (sr < 0) {
                 next_tick = sr & ~TIMER_CB;
             } else {
                 lp->media = SPD_DET;
@@ -3040,10 +3041,10 @@ dc2114x_autoconf(struct net_device *dev)
                     if (!(anlpa & MII_ANLPA_RF) &&
                          (cap = anlpa & MII_ANLPA_TAF & ana)) {
                         if (cap & MII_ANA_100M) {
-                            lp->fdx = ((ana & anlpa & MII_ANA_FDAM & MII_ANA_100M) ? TRUE : FALSE);
+                            lp->fdx = (ana & anlpa & MII_ANA_FDAM & MII_ANA_100M) != 0;
                             lp->media = _100Mb;
                         } else if (cap & MII_ANA_10M) {
-                            lp->fdx = ((ana & anlpa & MII_ANA_FDAM & MII_ANA_10M) ? TRUE : FALSE);
+                            lp->fdx = (ana & anlpa & MII_ANA_FDAM & MII_ANA_10M) != 0;
                             lp->media = _10Mb;
                         }
                     }
@@ -3222,14 +3223,14 @@ srom_map_media(struct net_device *dev)
 {
     struct de4x5_private *lp = netdev_priv(dev);
 
-    lp->fdx = 0;
+    lp->fdx = false;
     if (lp->infoblock_media == lp->media)
       return 0;
 
     switch(lp->infoblock_media) {
       case SROM_10BASETF:
         if (!lp->params.fdx) return -1;
-        lp->fdx = TRUE;
+        lp->fdx = true;
       case SROM_10BASET:
         if (lp->params.fdx && !lp->fdx) return -1;
         if ((lp->chipset == DC21140) || ((lp->chipset & ~0x00ff) == DC2114x)) {
@@ -3249,7 +3250,7 @@ srom_map_media(struct net_device *dev)
 
       case SROM_100BASETF:
         if (!lp->params.fdx) return -1;
-        lp->fdx = TRUE;
+        lp->fdx = true;
       case SROM_100BASET:
         if (lp->params.fdx && !lp->fdx) return -1;
         lp->media = _100Mb;
@@ -3261,7 +3262,7 @@ srom_map_media(struct net_device *dev)
 
       case SROM_100BASEFF:
         if (!lp->params.fdx) return -1;
-        lp->fdx = TRUE;
+        lp->fdx = true;
       case SROM_100BASEF:
         if (lp->params.fdx && !lp->fdx) return -1;
         lp->media = _100Mb;
@@ -3297,7 +3298,7 @@ de4x5_init_connection(struct net_device *dev)
     spin_lock_irqsave(&lp->lock, flags);
     de4x5_rst_desc_ring(dev);
     de4x5_setup_intr(dev);
-    lp->tx_enable = YES;
+    lp->tx_enable = true;
     spin_unlock_irqrestore(&lp->lock, flags);
     outl(POLL_DEMAND, DE4X5_TPD);
 
@@ -3336,7 +3337,7 @@ de4x5_reset_phy(struct net_device *dev)
             }
         }
         if (lp->useMII) {
-            next_tick = test_mii_reg(dev, MII_CR, MII_CR_RST, FALSE, 500);
+            next_tick = test_mii_reg(dev, MII_CR, MII_CR_RST, false, 500);
         }
     } else if (lp->chipset == DC21140) {
         PHY_HARD_RESET;
@@ -3466,7 +3467,7 @@ wait_for_link(struct net_device *dev)
 **
 */
 static int
-test_mii_reg(struct net_device *dev, int reg, int mask, int pol, long msec)
+test_mii_reg(struct net_device *dev, int reg, int mask, bool pol, long msec)
 {
     struct de4x5_private *lp = netdev_priv(dev);
     int test;
@@ -3476,9 +3477,8 @@ test_mii_reg(struct net_device *dev, int reg, int mask, int pol, long msec)
         lp->timeout = msec/100;
     }
 
-    if (pol) pol = ~0;
     reg = mii_rd((u_char)reg, lp->phy[lp->active].addr, DE4X5_MII) & mask;
-    test = (reg ^ pol) & mask;
+    test = (reg ^ (pol ? ~0 : 0)) & mask;
 
     if (test && --lp->timeout) {
         reg = 100 | TIMER_CB;
@@ -3992,10 +3992,10 @@ PCI_signature(char *name, struct de4x5_private *lp)
                              )))))));
         }
         if (lp->chipset != DC21041) {
-            lp->useSROM = TRUE;             /* card is not recognisably DEC */
+            lp->useSROM = true;             /* card is not recognisably DEC */
         }
     } else if ((lp->chipset & ~0x00ff) == DC2114x) {
-        lp->useSROM = TRUE;
+        lp->useSROM = true;
     }
 
     return status;
@@ -4216,7 +4216,7 @@ srom_repair(struct net_device *dev, int card)
         memset((char *)&lp->srom, 0, sizeof(struct de4x5_srom));
         memcpy(lp->srom.ieee_addr, (char *)dev->dev_addr, ETH_ALEN);
         memcpy(lp->srom.info, (char *)&srom_repair_info[SMC-1], 100);
-        lp->useSROM = TRUE;
+        lp->useSROM = true;
         break;
     }
 
@@ -4392,7 +4392,7 @@ srom_infoleaf_info(struct net_device *dev)
         if (lp->chipset == infoleaf_array[i].chipset) break;
     }
     if (i == INFOLEAF_SIZE) {
-        lp->useSROM = FALSE;
+        lp->useSROM = false;
         printk("%s: Cannot find correct chipset for SROM decoding!\n",
                                                                   dev->name);
         return -ENXIO;
@@ -4409,7 +4409,7 @@ srom_infoleaf_info(struct net_device *dev)
             if (lp->device == *p) break;
         }
         if (i == 0) {
-            lp->useSROM = FALSE;
+            lp->useSROM = false;
             printk("%s: Cannot find correct PCI device [%d] for SROM decoding!\n",
                                                        dev->name, lp->device);
             return -ENXIO;
@@ -4542,7 +4542,7 @@ dc21140_infoleaf(struct net_device *dev)
         }
         lp->media = INIT;
         lp->tcount = 0;
-        lp->tx_enable = FALSE;
+        lp->tx_enable = false;
     }
 
     return next_tick & ~TIMER_CB;
@@ -4577,7 +4577,7 @@ dc21142_infoleaf(struct net_device *dev)
         }
         lp->media = INIT;
         lp->tcount = 0;
-        lp->tx_enable = FALSE;
+        lp->tx_enable = false;
     }
 
     return next_tick & ~TIMER_CB;
@@ -4611,7 +4611,7 @@ dc21143_infoleaf(struct net_device *dev)
         }
         lp->media = INIT;
         lp->tcount = 0;
-        lp->tx_enable = FALSE;
+        lp->tx_enable = false;
     }
 
     return next_tick & ~TIMER_CB;
@@ -4650,7 +4650,7 @@ compact_infoblock(struct net_device *dev, u_char count, u_char *p)
         lp->asBit = 1 << ((csr6 >> 1) & 0x07);
         lp->asPolarity = ((csr6 & 0x80) ? -1 : 0) & lp->asBit;
         lp->infoblock_csr6 = OMR_DEF | ((csr6 & 0x71) << 18);
-        lp->useMII = FALSE;
+        lp->useMII = false;
 
         de4x5_switch_mac_port(dev);
     }
@@ -4691,7 +4691,7 @@ type0_infoblock(struct net_device *dev, u_char count, u_char *p)
         lp->asBit = 1 << ((csr6 >> 1) & 0x07);
         lp->asPolarity = ((csr6 & 0x80) ? -1 : 0) & lp->asBit;
         lp->infoblock_csr6 = OMR_DEF | ((csr6 & 0x71) << 18);
-        lp->useMII = FALSE;
+        lp->useMII = false;
 
         de4x5_switch_mac_port(dev);
     }
@@ -4731,7 +4731,7 @@ type1_infoblock(struct net_device *dev, u_char count, u_char *p)
         lp->ibn = 1;
         lp->active = *p;
         lp->infoblock_csr6 = OMR_MII_100;
-        lp->useMII = TRUE;
+        lp->useMII = true;
         lp->infoblock_media = ANS;
 
         de4x5_switch_mac_port(dev);
@@ -4773,7 +4773,7 @@ type2_infoblock(struct net_device *dev, u_char count, u_char *p)
         lp->cache.gepc = ((s32)(TWIDDLE(p)) << 16); p += 2;
         lp->cache.gep  = ((s32)(TWIDDLE(p)) << 16);
         lp->infoblock_csr6 = OMR_SIA;
-        lp->useMII = FALSE;
+        lp->useMII = false;
 
         de4x5_switch_mac_port(dev);
     }
@@ -4814,7 +4814,7 @@ type3_infoblock(struct net_device *dev, u_char count, u_char *p)
         lp->active = *p;
         if (MOTO_SROM_BUG) lp->active = 0;
         lp->infoblock_csr6 = OMR_MII_100;
-        lp->useMII = TRUE;
+        lp->useMII = true;
         lp->infoblock_media = ANS;
 
         de4x5_switch_mac_port(dev);
@@ -4856,7 +4856,7 @@ type4_infoblock(struct net_device *dev, u_char count, u_char *p)
         lp->asBit = 1 << ((csr6 >> 1) & 0x07);
         lp->asPolarity = ((csr6 & 0x80) ? -1 : 0) & lp->asBit;
         lp->infoblock_csr6 = OMR_DEF | ((csr6 & 0x71) << 18);
-        lp->useMII = FALSE;
+        lp->useMII = false;
 
         de4x5_switch_mac_port(dev);
     }
@@ -5077,7 +5077,7 @@ mii_get_phy(struct net_device *dev)
     int id;
 
     lp->active = 0;
-    lp->useMII = TRUE;
+    lp->useMII = true;
 
     /* Search the MII address space for possible PHY devices */
     for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(i+1)%DE4X5_MAX_MII) {
@@ -5127,7 +5127,7 @@ mii_get_phy(struct net_device *dev)
             de4x5_dbg_mii(dev, k);
         }
     }
-    if (!lp->mii_cnt) lp->useMII = FALSE;
+    if (!lp->mii_cnt) lp->useMII = false;
 
     return lp->mii_cnt;
 }
diff --git a/drivers/net/tulip/de4x5.h b/drivers/net/tulip/de4x5.h
index 57226e5eb8a6..12af0cc037fb 100644
--- a/drivers/net/tulip/de4x5.h
+++ b/drivers/net/tulip/de4x5.h
@@ -893,15 +893,6 @@
 #define PHYS_ADDR_ONLY       1     /* Update the physical address only */
 
 /*
-** Booleans
-*/
-#define NO                   0
-#define FALSE                0
-
-#define YES                  ~0
-#define TRUE                 ~0
-
-/*
 ** Adapter state
 */
 #define INITIALISED          0     /* After h/w initialised and mem alloc'd */
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index a12f576391cf..86b690843362 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -192,7 +192,7 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf)
                                 usb_pipeendpoint(pipe), maxp, period);
                 }
         }
-        return  0;
+        return 0;
 }
 
 /* Passes this packet up the stack, updating its accounting.
@@ -326,7 +326,7 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
         if (netif_running (dev->net)
                         && netif_device_present (dev->net)
                         && !test_bit (EVENT_RX_HALT, &dev->flags)) {
-                switch (retval = usb_submit_urb (urb, GFP_ATOMIC)){
+                switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) {
                 case -EPIPE:
                         usbnet_defer_kevent (dev, EVENT_RX_HALT);
                         break;
@@ -393,8 +393,8 @@ static void rx_complete (struct urb *urb)
         entry->urb = NULL;
 
         switch (urb_status) {
-            // success
-            case 0:
+        /* success */
+        case 0:
                 if (skb->len < dev->net->hard_header_len) {
                         entry->state = rx_cleanup;
                         dev->stats.rx_errors++;
@@ -404,28 +404,30 @@ static void rx_complete (struct urb *urb)
                 }
                 break;
 
-            // stalls need manual reset. this is rare ... except that
-            // when going through USB 2.0 TTs, unplug appears this way.
-            // we avoid the highspeed version of the ETIMEOUT/EILSEQ
-            // storm, recovering as needed.
-            case -EPIPE:
+        /* stalls need manual reset. this is rare ... except that
+         * when going through USB 2.0 TTs, unplug appears this way.
+         * we avoid the highspeed version of the ETIMEOUT/EILSEQ
+         * storm, recovering as needed.
+         */
+        case -EPIPE:
                 dev->stats.rx_errors++;
                 usbnet_defer_kevent (dev, EVENT_RX_HALT);
                 // FALLTHROUGH
 
-            // software-driven interface shutdown
-            case -ECONNRESET:           // async unlink
-            case -ESHUTDOWN:            // hardware gone
+        /* software-driven interface shutdown */
+        case -ECONNRESET:               /* async unlink */
+        case -ESHUTDOWN:                /* hardware gone */
                 if (netif_msg_ifdown (dev))
                         devdbg (dev, "rx shutdown, code %d", urb_status);
                 goto block;
 
-            // we get controller i/o faults during khubd disconnect() delays.
-            // throttle down resubmits, to avoid log floods; just temporarily,
-            // so we still recover when the fault isn't a khubd delay.
-            case -EPROTO:
-            case -ETIME:
-            case -EILSEQ:
+        /* we get controller i/o faults during khubd disconnect() delays.
+         * throttle down resubmits, to avoid log floods; just temporarily,
+         * so we still recover when the fault isn't a khubd delay.
+         */
+        case -EPROTO:
+        case -ETIME:
+        case -EILSEQ:
                 dev->stats.rx_errors++;
                 if (!timer_pending (&dev->delay)) {
                         mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES);
@@ -438,12 +440,12 @@ block:
                 urb = NULL;
                 break;
 
-            // data overrun ... flush fifo?
-            case -EOVERFLOW:
+        /* data overrun ... flush fifo? */
+        case -EOVERFLOW:
                 dev->stats.rx_over_errors++;
                 // FALLTHROUGH
 
-            default:
+        default:
                 entry->state = rx_cleanup;
                 dev->stats.rx_errors++;
                 if (netif_msg_rx_err (dev))
@@ -471,22 +473,22 @@ static void intr_complete (struct urb *urb)
         int             status = urb->status;
 
         switch (status) {
-            /* success */
-            case 0:
+        /* success */
+        case 0:
                 dev->driver_info->status(dev, urb);
                 break;
 
-            /* software-driven interface shutdown */
-            case -ENOENT:               // urb killed
-            case -ESHUTDOWN:            // hardware gone
+        /* software-driven interface shutdown */
+        case -ENOENT:           /* urb killed */
+        case -ESHUTDOWN:        /* hardware gone */
                 if (netif_msg_ifdown (dev))
                         devdbg (dev, "intr shutdown, code %d", status);
                 return;
 
-            /* NOTE:  not throttling like RX/TX, since this endpoint
-             * already polls infrequently
-             */
-            default:
+        /* NOTE:  not throttling like RX/TX, since this endpoint
+         * already polls infrequently
+         */
+        default:
                 devdbg (dev, "intr status %d", status);
                 break;
         }
@@ -569,9 +571,9 @@ static int usbnet_stop (struct net_device *net)
         temp = unlink_urbs (dev, &dev->txq) + unlink_urbs (dev, &dev->rxq);
 
         // maybe wait for deletions to finish.
-        while (!skb_queue_empty(&dev->rxq) &&
-               !skb_queue_empty(&dev->txq) &&
-               !skb_queue_empty(&dev->done)) {
+        while (!skb_queue_empty(&dev->rxq)
+                        && !skb_queue_empty(&dev->txq)
+                        && !skb_queue_empty(&dev->done)) {
                 msleep(UNLINK_TIMEOUT_MS);
                 if (netif_msg_ifdown (dev))
                         devdbg (dev, "waited for %d urb completions", temp);
@@ -1011,16 +1013,16 @@ static void usbnet_bh (unsigned long param)
         while ((skb = skb_dequeue (&dev->done))) {
                 entry = (struct skb_data *) skb->cb;
                 switch (entry->state) {
-                    case rx_done:
+                case rx_done:
                         entry->state = rx_cleanup;
                         rx_process (dev, skb);
                         continue;
-                    case tx_done:
-                    case rx_cleanup:
+                case tx_done:
+                case rx_cleanup:
                         usb_free_urb (entry->urb);
                         dev_kfree_skb (skb);
                         continue;
-                    default:
+                default:
                         devdbg (dev, "bogus skb state %d", entry->state);
                 }
         }
diff --git a/drivers/net/usb/usbnet.h b/drivers/net/usb/usbnet.h
index a3f8b9e7bc00..a6c5820767de 100644
--- a/drivers/net/usb/usbnet.h
+++ b/drivers/net/usb/usbnet.h
@@ -47,7 +47,7 @@ struct usbnet {
         unsigned long           data [5];
         u32                     xid;
         u32                     hard_mtu;       /* count any extra framing */
-        size_t                  rx_urb_size;    /* size for rx urbs  */
+        size_t                  rx_urb_size;    /* size for rx urbs */
         struct mii_if_info      mii;
 
         /* various kinds of pending driver work */
@@ -85,7 +85,7 @@ struct driver_info {
 #define FLAG_NO_SETINT  0x0010          /* device can't set_interface() */
 #define FLAG_ETHER      0x0020          /* maybe use "eth%d" names */
 
-#define FLAG_FRAMING_AX 0x0040          /* AX88772/178 packets */
+#define FLAG_FRAMING_AX 0x0040          /* AX88772/178 packets */
 
         /* init device ... can sleep, or cause probe() failure */
         int     (*bind)(struct usbnet *, struct usb_interface *);
@@ -146,9 +146,9 @@ extern void usbnet_cdc_unbind (struct usbnet *, struct usb_interface *);
 
 /* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
 #define DEFAULT_FILTER  (USB_CDC_PACKET_TYPE_BROADCAST \
-                        |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
-                        |USB_CDC_PACKET_TYPE_PROMISCUOUS \
-                        |USB_CDC_PACKET_TYPE_DIRECTED)
+                        |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
+                        |USB_CDC_PACKET_TYPE_PROMISCUOUS \
+                        |USB_CDC_PACKET_TYPE_DIRECTED)
 
 
 /* we record the state for each of our queued skbs */
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index fa2399cbd5ca..ae27af0141c0 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -546,6 +546,18 @@ config USB_ZD1201
           To compile this driver as a module, choose M here: the
           module will be called zd1201.
 
+config RTL8187
+        tristate "Realtek 8187 USB support"
+        depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
+        select EEPROM_93CX6
+        ---help---
+          This is a driver for RTL8187 based cards.
+          These are USB based chips found in cards such as:
+
+          Netgear WG111v2
+
+          Thanks to Realtek for their support!
+
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/bcm43xx/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index d2124602263b..ef35bc6c4a22 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -44,3 +44,6 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_ZD1201)        += zd1201.o
 obj-$(CONFIG_LIBERTAS_USB)     += libertas/
+
+rtl8187-objs            := rtl8187_dev.o rtl8187_rtl8225.o
+obj-$(CONFIG_RTL8187)   += rtl8187.o
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index b37f1e348700..d779199c30d0 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -1638,7 +1638,7 @@ void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
                 return;
         }
 
-        if (phy->analog > 1) {
+        if (phy->analog == 1) {
                 value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C;
                 value |= (baseband_attenuation << 2) & 0x003C;
         } else {
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 5b3abd54d0e5..90900525379c 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -326,7 +326,6 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
         char *p = page;
         struct ap_data *ap = (struct ap_data *) data;
         char *policy_txt;
-        struct list_head *ptr;
         struct mac_entry *entry;
 
         if (off != 0) {
@@ -352,14 +351,12 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
         p += sprintf(p, "MAC entries: %u\n", ap->mac_restrictions.entries);
         p += sprintf(p, "MAC list:\n");
         spin_lock_bh(&ap->mac_restrictions.lock);
-        for (ptr = ap->mac_restrictions.mac_list.next;
-             ptr != &ap->mac_restrictions.mac_list; ptr = ptr->next) {
+        list_for_each_entry(entry, &ap->mac_restrictions.mac_list, list) {
                 if (p - page > PAGE_SIZE - 80) {
                         p += sprintf(p, "All entries did not fit one page.\n");
                         break;
                 }
 
-                entry = list_entry(ptr, struct mac_entry, list);
                 p += sprintf(p, MACSTR "\n", MAC2STR(entry->addr));
         }
         spin_unlock_bh(&ap->mac_restrictions.lock);
@@ -413,7 +410,6 @@ int ap_control_del_mac(struct mac_restrictions *mac_restrictions, u8 *mac)
 static int ap_control_mac_deny(struct mac_restrictions *mac_restrictions,
                                u8 *mac)
 {
-        struct list_head *ptr;
         struct mac_entry *entry;
         int found = 0;
 
@@ -421,10 +417,7 @@ static int ap_control_mac_deny(struct mac_restrictions *mac_restrictions,
                 return 0;
 
         spin_lock_bh(&mac_restrictions->lock);
-        for (ptr = mac_restrictions->mac_list.next;
-             ptr != &mac_restrictions->mac_list; ptr = ptr->next) {
-                entry = list_entry(ptr, struct mac_entry, list);
-
+        list_for_each_entry(entry, &mac_restrictions->mac_list, list) {
                 if (memcmp(entry->addr, mac, ETH_ALEN) == 0) {
                         found = 1;
                         break;
@@ -519,7 +512,7 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off,
 {
         char *p = page;
         struct ap_data *ap = (struct ap_data *) data;
-        struct list_head *ptr;
+        struct sta_info *sta;
         int i;
 
         if (off > PROC_LIMIT) {
@@ -529,9 +522,7 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off,
 
         p += sprintf(p, "# BSSID CHAN SIGNAL NOISE RATE SSID FLAGS\n");
         spin_lock_bh(&ap->sta_table_lock);
-        for (ptr = ap->sta_list.next; ptr != &ap->sta_list; ptr = ptr->next) {
-                struct sta_info *sta = (struct sta_info *) ptr;
-
+        list_for_each_entry(sta, &ap->sta_list, list) {
                 if (!sta->ap)
                         continue;
 
@@ -861,7 +852,7 @@ void hostap_init_ap_proc(local_info_t *local)
 
 void hostap_free_data(struct ap_data *ap)
 {
-        struct list_head *n, *ptr;
+        struct sta_info *n, *sta;
 
         if (ap == NULL || !ap->initialized) {
                 printk(KERN_DEBUG "hostap_free_data: ap has not yet been "
@@ -875,8 +866,7 @@ void hostap_free_data(struct ap_data *ap)
         ap->crypt = ap->crypt_priv = NULL;
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
 
-        list_for_each_safe(ptr, n, &ap->sta_list) {
-                struct sta_info *sta = list_entry(ptr, struct sta_info, list);
+        list_for_each_entry_safe(sta, n, &ap->sta_list, list) {
                 ap_sta_hash_del(ap, sta);
                 list_del(&sta->list);
                 if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap && sta->local)
@@ -2704,6 +2694,8 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
 
         if (hdr->addr1[0] & 0x01) {
                 /* broadcast/multicast frame - no AP related processing */
+                if (local->ap->num_sta <= 0)
+                        ret = AP_TX_DROP;
                 goto out;
         }
 
@@ -3198,15 +3190,14 @@ int hostap_update_rx_stats(struct ap_data *ap,
 
 void hostap_update_rates(local_info_t *local)
 {
-        struct list_head *ptr;
+        struct sta_info *sta;
         struct ap_data *ap = local->ap;
 
         if (!ap)
                 return;
 
         spin_lock_bh(&ap->sta_table_lock);
-        for (ptr = ap->sta_list.next; ptr != &ap->sta_list; ptr = ptr->next) {
-                struct sta_info *sta = (struct sta_info *) ptr;
+        list_for_each_entry(sta, &ap->sta_list, list) {
                 prism2_check_tx_rates(sta);
         }
         spin_unlock_bh(&ap->sta_table_lock);
@@ -3242,11 +3233,10 @@ void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,
 void hostap_add_wds_links(local_info_t *local)
 {
         struct ap_data *ap = local->ap;
-        struct list_head *ptr;
+        struct sta_info *sta;
 
         spin_lock_bh(&ap->sta_table_lock);
-        list_for_each(ptr, &ap->sta_list) {
-                struct sta_info *sta = list_entry(ptr, struct sta_info, list);
+        list_for_each_entry(sta, &ap->sta_list, list) {
                 if (sta->ap)
                         hostap_wds_link_oper(local, sta->addr, WDS_ADD);
         }
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index c090a5aebb58..30acd39d76a2 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -1,8 +1,6 @@
 #ifndef HOSTAP_CONFIG_H
 #define HOSTAP_CONFIG_H
 
-#define PRISM2_VERSION "0.4.4-kernel"
-
 /* In the previous versions of Host AP driver, support for user space version
  * of IEEE 802.11 management (hostapd) used to be disabled in the default
  * configuration. From now on, support for hostapd is always included and it is
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index ee1532b62e42..30e723f65979 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -22,7 +22,6 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static dev_info_t dev_info = "hostap_cs";
 
 MODULE_AUTHOR("Jouni Malinen");
@@ -30,7 +29,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
                    "cards (PC Card).");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(PRISM2_VERSION);
 
 
 static int ignore_cis_vcc;
@@ -910,14 +908,12 @@ static struct pcmcia_driver hostap_driver = {
 
 static int __init init_prism2_pccard(void)
 {
-        printk(KERN_INFO "%s: %s\n", dev_info, version);
         return pcmcia_register_driver(&hostap_driver);
 }
 
 static void __exit exit_prism2_pccard(void)
 {
         pcmcia_unregister_driver(&hostap_driver);
-        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
 }
 
 
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index cdea7f71b9eb..8c71077d653c 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct net_device *dev,
         local = iface->local;
 
         strncpy(info->driver, "hostap", sizeof(info->driver) - 1);
-        strncpy(info->version, PRISM2_VERSION,
-                sizeof(info->version) - 1);
         snprintf(info->fw_version, sizeof(info->fw_version) - 1,
                  "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,
                  (local->sta_fw_ver >> 8) & 0xff,
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 4743426cf6ad..446de51bab74 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -37,7 +37,6 @@
 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Host AP common routines");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(PRISM2_VERSION);
 
 #define TX_TIMEOUT (2 * HZ)
 
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index db4899ed4bb1..0cd48d151f5e 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -20,7 +20,6 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static char *dev_info = "hostap_pci";
 
 
@@ -29,7 +28,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN "
                    "PCI cards.");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(PRISM2_VERSION);
 
 
 /* struct local_info::hw_priv */
@@ -462,8 +460,6 @@ static struct pci_driver prism2_pci_drv_id = {
 
 static int __init init_prism2_pci(void)
 {
-        printk(KERN_INFO "%s: %s\n", dev_info, version);
-
         return pci_register_driver(&prism2_pci_drv_id);
 }
 
@@ -471,7 +467,6 @@ static int __init init_prism2_pci(void)
 static void __exit exit_prism2_pci(void)
 {
         pci_unregister_driver(&prism2_pci_drv_id);
-        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
 }
 
 
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index f0fd5ecdb24d..0183df757b3e 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -23,7 +23,6 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static char *dev_info = "hostap_plx";
 
 
@@ -32,7 +31,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
                    "cards (PLX).");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(PRISM2_VERSION);
 
 
 static int ignore_cis;
@@ -623,8 +621,6 @@ static struct pci_driver prism2_plx_drv_id = {
 
 static int __init init_prism2_plx(void)
 {
-        printk(KERN_INFO "%s: %s\n", dev_info, version);
-
         return pci_register_driver(&prism2_plx_drv_id);
 }
 
@@ -632,7 +628,6 @@ static int __init init_prism2_plx(void)
 static void __exit exit_prism2_plx(void)
 {
         pci_unregister_driver(&prism2_plx_drv_id);
-        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
 }
 
 
diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
new file mode 100644
index 000000000000..6124e467b156
--- /dev/null
+++ b/drivers/net/wireless/rtl8187.h
@@ -0,0 +1,145 @@
+/*
+ * Definitions for RTL8187 hardware
+ *
+ * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
+ *
+ * Based on the r8187 driver, which is:
+ * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ *
+ * 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.
+ */
+
+#ifndef RTL8187_H
+#define RTL8187_H
+
+#include "rtl818x.h"
+
+#define RTL8187_EEPROM_TXPWR_BASE       0x05
+#define RTL8187_EEPROM_MAC_ADDR         0x07
+#define RTL8187_EEPROM_TXPWR_CHAN_1     0x16    /* 3 channels */
+#define RTL8187_EEPROM_TXPWR_CHAN_6     0x1B    /* 2 channels */
+#define RTL8187_EEPROM_TXPWR_CHAN_4     0x3D    /* 2 channels */
+
+#define RTL8187_REQT_READ       0xC0
+#define RTL8187_REQT_WRITE      0x40
+#define RTL8187_REQ_GET_REG     0x05
+#define RTL8187_REQ_SET_REG     0x05
+
+#define RTL8187_MAX_RX          0x9C4
+
+struct rtl8187_rx_info {
+        struct urb *urb;
+        struct ieee80211_hw *dev;
+};
+
+struct rtl8187_rx_hdr {
+        __le16 len;
+        __le16 rate;
+        u8 noise;
+        u8 signal;
+        u8 agc;
+        u8 reserved;
+        __le64 mac_time;
+} __attribute__((packed));
+
+struct rtl8187_tx_info {
+        struct ieee80211_tx_control *control;
+        struct urb *urb;
+        struct ieee80211_hw *dev;
+};
+
+struct rtl8187_tx_hdr {
+        __le32 flags;
+#define RTL8187_TX_FLAG_NO_ENCRYPT      (1 << 15)
+#define RTL8187_TX_FLAG_MORE_FRAG       (1 << 17)
+#define RTL8187_TX_FLAG_CTS             (1 << 18)
+#define RTL8187_TX_FLAG_RTS             (1 << 23)
+        __le16 rts_duration;
+        __le16 len;
+        __le32 retry;
+} __attribute__((packed));
+
+struct rtl8187_priv {
+        /* common between rtl818x drivers */
+        struct rtl818x_csr *map;
+        void (*rf_init)(struct ieee80211_hw *);
+        int mode;
+
+        /* rtl8187 specific */
+        struct ieee80211_channel channels[14];
+        struct ieee80211_rate rates[12];
+        struct ieee80211_hw_mode modes[2];
+        struct usb_device *udev;
+        u8 *hwaddr;
+        u16 txpwr_base;
+        u8 asic_rev;
+        struct sk_buff_head rx_queue;
+};
+
+void rtl8187_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);
+
+static inline u8 rtl818x_ioread8(struct rtl8187_priv *priv, u8 *addr)
+{
+        u8 val;
+
+        usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_GET_REG, RTL8187_REQT_READ,
+                        (unsigned long)addr, 0, &val, sizeof(val), HZ / 2);
+
+        return val;
+}
+
+static inline u16 rtl818x_ioread16(struct rtl8187_priv *priv, __le16 *addr)
+{
+        __le16 val;
+
+        usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_GET_REG, RTL8187_REQT_READ,
+                        (unsigned long)addr, 0, &val, sizeof(val), HZ / 2);
+
+        return le16_to_cpu(val);
+}
+
+static inline u32 rtl818x_ioread32(struct rtl8187_priv *priv, __le32 *addr)
+{
+        __le32 val;
+
+        usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_GET_REG, RTL8187_REQT_READ,
+                        (unsigned long)addr, 0, &val, sizeof(val), HZ / 2);
+
+        return le32_to_cpu(val);
+}
+
+static inline void rtl818x_iowrite8(struct rtl8187_priv *priv,
+                                    u8 *addr, u8 val)
+{
+        usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,
+                        (unsigned long)addr, 0, &val, sizeof(val), HZ / 2);
+}
+
+static inline void rtl818x_iowrite16(struct rtl8187_priv *priv,
+                                     __le16 *addr, u16 val)
+{
+        __le16 buf = cpu_to_le16(val);
+
+        usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,
+                        (unsigned long)addr, 0, &buf, sizeof(buf), HZ / 2);
+}
+
+static inline void rtl818x_iowrite32(struct rtl8187_priv *priv,
+                                     __le32 *addr, u32 val)
+{
+        __le32 buf = cpu_to_le32(val);
+
+        usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,
+                        (unsigned long)addr, 0, &buf, sizeof(buf), HZ / 2);
+}
+
+#endif /* RTL8187_H */
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
new file mode 100644
index 000000000000..cea85894b7f2
--- /dev/null
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -0,0 +1,731 @@
+/*
+ * Linux device driver for RTL8187
+ *
+ * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
+ *
+ * Based on the r8187 driver, which is:
+ * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ *
+ * Magic delays and register offsets below are taken from the original
+ * r8187 driver sources.  Thanks to Realtek for their support!
+ *
+ * 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.
+ */
+
+#include <linux/init.h>
+#include <linux/usb.h>
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/eeprom_93cx6.h>
+#include <net/mac80211.h>
+
+#include "rtl8187.h"
+#include "rtl8187_rtl8225.h"
+
+MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
+MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
+MODULE_DESCRIPTION("RTL8187 USB wireless driver");
+MODULE_LICENSE("GPL");
+
+static struct usb_device_id rtl8187_table[] __devinitdata = {
+        /* Realtek */
+        {USB_DEVICE(0x0bda, 0x8187)},
+        /* Netgear */
+        {USB_DEVICE(0x0846, 0x6100)},
+        {USB_DEVICE(0x0846, 0x6a00)},
+        {}
+};
+
+MODULE_DEVICE_TABLE(usb, rtl8187_table);
+
+void rtl8187_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data)
+{
+        struct rtl8187_priv *priv = dev->priv;
+
+        data <<= 8;
+        data |= addr | 0x80;
+
+        rtl818x_iowrite8(priv, &priv->map->PHY[3], (data >> 24) & 0xFF);
+        rtl818x_iowrite8(priv, &priv->map->PHY[2], (data >> 16) & 0xFF);
+        rtl818x_iowrite8(priv, &priv->map->PHY[1], (data >> 8) & 0xFF);
+        rtl818x_iowrite8(priv, &priv->map->PHY[0], data & 0xFF);
+
+        msleep(1);
+}
+
+static void rtl8187_tx_cb(struct urb *urb)
+{
+        struct ieee80211_tx_status status = { {0} };
+        struct sk_buff *skb = (struct sk_buff *)urb->context;
+        struct rtl8187_tx_info *info = (struct rtl8187_tx_info *)skb->cb;
+
+        usb_free_urb(info->urb);
+        if (info->control)
+                memcpy(&status.control, info->control, sizeof(status.control));
+        kfree(info->control);
+        skb_pull(skb, sizeof(struct rtl8187_tx_hdr));
+        status.flags |= IEEE80211_TX_STATUS_ACK;
+        ieee80211_tx_status_irqsafe(info->dev, skb, &status);
+}
+
+static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
+                      struct ieee80211_tx_control *control)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        struct rtl8187_tx_hdr *hdr;
+        struct rtl8187_tx_info *info;
+        struct urb *urb;
+        u32 tmp;
+
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (!urb) {
+                kfree_skb(skb);
+                return 0;
+        }
+
+        hdr = (struct rtl8187_tx_hdr *)skb_push(skb, sizeof(*hdr));
+        tmp = skb->len - sizeof(*hdr);
+        tmp |= RTL8187_TX_FLAG_NO_ENCRYPT;
+        tmp |= control->rts_cts_rate << 19;
+        tmp |= control->tx_rate << 24;
+        if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb))
+                tmp |= RTL8187_TX_FLAG_MORE_FRAG;
+        if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
+                tmp |= RTL8187_TX_FLAG_RTS;
+                hdr->rts_duration =
+                        ieee80211_rts_duration(dev, skb->len, control);
+        }
+        if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+                tmp |= RTL8187_TX_FLAG_CTS;
+        hdr->flags = cpu_to_le32(tmp);
+        hdr->len = 0;
+        tmp = control->retry_limit << 8;
+        hdr->retry = cpu_to_le32(tmp);
+
+        info = (struct rtl8187_tx_info *)skb->cb;
+        info->control = kmemdup(control, sizeof(*control), GFP_ATOMIC);
+        info->urb = urb;
+        info->dev = dev;
+        usb_fill_bulk_urb(urb, priv->udev, usb_sndbulkpipe(priv->udev, 2),
+                          hdr, skb->len, rtl8187_tx_cb, skb);
+        usb_submit_urb(urb, GFP_ATOMIC);
+
+        return 0;
+}
+
+static void rtl8187_rx_cb(struct urb *urb)
+{
+        struct sk_buff *skb = (struct sk_buff *)urb->context;
+        struct rtl8187_rx_info *info = (struct rtl8187_rx_info *)skb->cb;
+        struct ieee80211_hw *dev = info->dev;
+        struct rtl8187_priv *priv = dev->priv;
+        struct rtl8187_rx_hdr *hdr;
+        struct ieee80211_rx_status rx_status = { 0 };
+        int rate, signal;
+
+        spin_lock(&priv->rx_queue.lock);
+        if (skb->next)
+                __skb_unlink(skb, &priv->rx_queue);
+        else {
+                spin_unlock(&priv->rx_queue.lock);
+                return;
+        }
+        spin_unlock(&priv->rx_queue.lock);
+
+        if (unlikely(urb->status)) {
+                usb_free_urb(urb);
+                dev_kfree_skb_irq(skb);
+                return;
+        }
+
+        skb_put(skb, urb->actual_length);
+        hdr = (struct rtl8187_rx_hdr *)(skb_tail_pointer(skb) - sizeof(*hdr));
+        skb_trim(skb, le16_to_cpu(hdr->len) & 0x0FFF);
+
+        signal = hdr->agc >> 1;
+        rate = (le16_to_cpu(hdr->rate) >> 4) & 0xF;
+        if (rate > 3) { /* OFDM rate */
+                if (signal > 90)
+                        signal = 90;
+                else if (signal < 25)
+                        signal = 25;
+                signal = 90 - signal;
+        } else {        /* CCK rate */
+                if (signal > 95)
+                        signal = 95;
+                else if (signal < 30)
+                        signal = 30;
+                signal = 95 - signal;
+        }
+
+        rx_status.antenna = (hdr->signal >> 7) & 1;
+        rx_status.signal = 64 - min(hdr->noise, (u8)64);
+        rx_status.ssi = signal;
+        rx_status.rate = rate;
+        rx_status.freq = dev->conf.freq;
+        rx_status.channel = dev->conf.channel;
+        rx_status.phymode = dev->conf.phymode;
+        rx_status.mactime = le64_to_cpu(hdr->mac_time);
+        ieee80211_rx_irqsafe(dev, skb, &rx_status);
+
+        skb = dev_alloc_skb(RTL8187_MAX_RX);
+        if (unlikely(!skb)) {
+                usb_free_urb(urb);
+                /* TODO check rx queue length and refill *somewhere* */
+                return;
+        }
+
+        info = (struct rtl8187_rx_info *)skb->cb;
+        info->urb = urb;
+        info->dev = dev;
+        urb->transfer_buffer = skb_tail_pointer(skb);
+        urb->context = skb;
+        skb_queue_tail(&priv->rx_queue, skb);
+
+        usb_submit_urb(urb, GFP_ATOMIC);
+}
+
+static int rtl8187_init_urbs(struct ieee80211_hw *dev)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        struct urb *entry;
+        struct sk_buff *skb;
+        struct rtl8187_rx_info *info;
+
+        while (skb_queue_len(&priv->rx_queue) < 8) {
+                skb = __dev_alloc_skb(RTL8187_MAX_RX, GFP_KERNEL);
+                if (!skb)
+                        break;
+                entry = usb_alloc_urb(0, GFP_KERNEL);
+                if (!entry) {
+                        kfree_skb(skb);
+                        break;
+                }
+                usb_fill_bulk_urb(entry, priv->udev,
+                                  usb_rcvbulkpipe(priv->udev, 1),
+                                  skb_tail_pointer(skb),
+                                  RTL8187_MAX_RX, rtl8187_rx_cb, skb);
+                info = (struct rtl8187_rx_info *)skb->cb;
+                info->urb = entry;
+                info->dev = dev;
+                skb_queue_tail(&priv->rx_queue, skb);
+                usb_submit_urb(entry, GFP_KERNEL);
+        }
+
+        return 0;
+}
+
+static int rtl8187_init_hw(struct ieee80211_hw *dev)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u8 reg;
+        int i;
+
+        /* reset */
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM, RTL8225_ANAPARAM_ON);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_ON);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0);
+
+        msleep(200);
+        rtl818x_iowrite8(priv, (u8 *)0xFE18, 0x10);
+        rtl818x_iowrite8(priv, (u8 *)0xFE18, 0x11);
+        rtl818x_iowrite8(priv, (u8 *)0xFE18, 0x00);
+        msleep(200);
+
+        reg = rtl818x_ioread8(priv, &priv->map->CMD);
+        reg &= (1 << 1);
+        reg |= RTL818X_CMD_RESET;
+        rtl818x_iowrite8(priv, &priv->map->CMD, reg);
+
+        i = 10;
+        do {
+                msleep(2);
+                if (!(rtl818x_ioread8(priv, &priv->map->CMD) &
+                      RTL818X_CMD_RESET))
+                        break;
+        } while (--i);
+
+        if (!i) {
+                printk(KERN_ERR "%s: Reset timeout!\n", wiphy_name(dev->wiphy));
+                return -ETIMEDOUT;
+        }
+
+        /* reload registers from eeprom */
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_LOAD);
+
+        i = 10;
+        do {
+                msleep(4);
+                if (!(rtl818x_ioread8(priv, &priv->map->EEPROM_CMD) &
+                      RTL818X_EEPROM_CMD_CONFIG))
+                        break;
+        } while (--i);
+
+        if (!i) {
+                printk(KERN_ERR "%s: eeprom reset timeout!\n",
+                       wiphy_name(dev->wiphy));
+                return -ETIMEDOUT;
+        }
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM, RTL8225_ANAPARAM_ON);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_ON);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        /* setup card */
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0);
+        rtl818x_iowrite8(priv, &priv->map->GPIO, 0);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, (4 << 8));
+        rtl818x_iowrite8(priv, &priv->map->GPIO, 1);
+        rtl818x_iowrite8(priv, &priv->map->GP_ENABLE, 0);
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        for (i = 0; i < ETH_ALEN; i++)
+                rtl818x_iowrite8(priv, &priv->map->MAC[i], priv->hwaddr[i]);
+
+        rtl818x_iowrite16(priv, (__le16 *)0xFFF4, 0xFFFF);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG1);
+        reg &= 0x3F;
+        reg |= 0x80;
+        rtl818x_iowrite8(priv, &priv->map->CONFIG1, reg);
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        rtl818x_iowrite32(priv, &priv->map->INT_TIMEOUT, 0);
+        rtl818x_iowrite8(priv, &priv->map->WPA_CONF, 0);
+        rtl818x_iowrite8(priv, &priv->map->RATE_FALLBACK, 0x81);
+
+        // TODO: set RESP_RATE and BRSR properly
+        rtl818x_iowrite8(priv, &priv->map->RESP_RATE, (8 << 4) | 0);
+        rtl818x_iowrite16(priv, &priv->map->BRSR, 0x01F3);
+
+        /* host_usb_init */
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0);
+        rtl818x_iowrite8(priv, &priv->map->GPIO, 0);
+        reg = rtl818x_ioread8(priv, (u8 *)0xFE53);
+        rtl818x_iowrite8(priv, (u8 *)0xFE53, reg | (1 << 7));
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, (4 << 8));
+        rtl818x_iowrite8(priv, &priv->map->GPIO, 0x20);
+        rtl818x_iowrite8(priv, &priv->map->GP_ENABLE, 0);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x80);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0x80);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x80);
+        msleep(100);
+
+        rtl818x_iowrite32(priv, &priv->map->RF_TIMING, 0x000a8008);
+        rtl818x_iowrite16(priv, &priv->map->BRSR, 0xFFFF);
+        rtl818x_iowrite32(priv, &priv->map->RF_PARA, 0x00100044);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, 0x44);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FF7);
+        msleep(100);
+
+        priv->rf_init(dev);
+
+        rtl818x_iowrite16(priv, &priv->map->BRSR, 0x01F3);
+        reg = rtl818x_ioread16(priv, &priv->map->PGSELECT) & 0xfffe;
+        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg | 0x1);
+        rtl818x_iowrite16(priv, (__le16 *)0xFFFE, 0x10);
+        rtl818x_iowrite8(priv, &priv->map->TALLY_SEL, 0x80);
+        rtl818x_iowrite8(priv, (u8 *)0xFFFF, 0x60);
+        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg);
+
+        return 0;
+}
+
+static void rtl8187_set_channel(struct ieee80211_hw *dev, int channel)
+{
+        u32 reg;
+        struct rtl8187_priv *priv = dev->priv;
+
+        reg = rtl818x_ioread32(priv, &priv->map->TX_CONF);
+        /* Enable TX loopback on MAC level to avoid TX during channel
+         * changes, as this has be seen to causes problems and the
+         * card will stop work until next reset
+         */
+        rtl818x_iowrite32(priv, &priv->map->TX_CONF,
+                          reg | RTL818X_TX_CONF_LOOPBACK_MAC);
+        msleep(10);
+        rtl8225_rf_set_channel(dev, channel);
+        msleep(10);
+        rtl818x_iowrite32(priv, &priv->map->TX_CONF, reg);
+}
+
+static int rtl8187_open(struct ieee80211_hw *dev)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u32 reg;
+        int ret;
+
+        ret = rtl8187_init_hw(dev);
+        if (ret)
+                return ret;
+
+        rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0xFFFF);
+
+        rtl8187_init_urbs(dev);
+
+        reg = RTL818X_RX_CONF_ONLYERLPKT |
+              RTL818X_RX_CONF_RX_AUTORESETPHY |
+              RTL818X_RX_CONF_BSSID |
+              RTL818X_RX_CONF_MGMT |
+              RTL818X_RX_CONF_CTRL |
+              RTL818X_RX_CONF_DATA |
+              (7 << 13 /* RX FIFO threshold NONE */) |
+              (7 << 10 /* MAX RX DMA */) |
+              RTL818X_RX_CONF_BROADCAST |
+              RTL818X_RX_CONF_MULTICAST |
+              RTL818X_RX_CONF_NICMAC;
+        if (priv->mode == IEEE80211_IF_TYPE_MNTR)
+                reg |= RTL818X_RX_CONF_MONITOR;
+
+        rtl818x_iowrite32(priv, &priv->map->RX_CONF, reg);
+
+        reg = rtl818x_ioread8(priv, &priv->map->CW_CONF);
+        reg &= ~RTL818X_CW_CONF_PERPACKET_CW_SHIFT;
+        reg |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT;
+        rtl818x_iowrite8(priv, &priv->map->CW_CONF, reg);
+
+        reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL);
+        reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT;
+        reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT;
+        reg &= ~RTL818X_TX_AGC_CTL_FEEDBACK_ANT;
+        rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg);
+
+        reg  = RTL818X_TX_CONF_CW_MIN |
+               (7 << 21 /* MAX TX DMA */) |
+               RTL818X_TX_CONF_NO_ICV;
+        rtl818x_iowrite32(priv, &priv->map->TX_CONF, reg);
+
+        reg = rtl818x_ioread8(priv, &priv->map->CMD);
+        reg |= RTL818X_CMD_TX_ENABLE;
+        reg |= RTL818X_CMD_RX_ENABLE;
+        rtl818x_iowrite8(priv, &priv->map->CMD, reg);
+
+        return 0;
+}
+
+static int rtl8187_stop(struct ieee80211_hw *dev)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        struct rtl8187_rx_info *info;
+        struct sk_buff *skb;
+        u32 reg;
+
+        rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0);
+
+        reg = rtl818x_ioread8(priv, &priv->map->CMD);
+        reg &= ~RTL818X_CMD_TX_ENABLE;
+        reg &= ~RTL818X_CMD_RX_ENABLE;
+        rtl818x_iowrite8(priv, &priv->map->CMD, reg);
+
+        rtl8225_rf_stop(dev);
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG4);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG4, reg | RTL818X_CONFIG4_VCOOFF);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        while ((skb = skb_dequeue(&priv->rx_queue))) {
+                info = (struct rtl8187_rx_info *)skb->cb;
+                usb_kill_urb(info->urb);
+                kfree_skb(skb);
+        }
+        return 0;
+}
+
+static int rtl8187_add_interface(struct ieee80211_hw *dev,
+                                 struct ieee80211_if_init_conf *conf)
+{
+        struct rtl8187_priv *priv = dev->priv;
+
+        /* NOTE: using IEEE80211_IF_TYPE_MGMT to indicate no mode selected */
+        if (priv->mode != IEEE80211_IF_TYPE_MGMT)
+                return -1;
+
+        switch (conf->type) {
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_MNTR:
+                priv->mode = conf->type;
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        priv->hwaddr = conf->mac_addr;
+
+        return 0;
+}
+
+static void rtl8187_remove_interface(struct ieee80211_hw *dev,
+                                     struct ieee80211_if_init_conf *conf)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        priv->mode = IEEE80211_IF_TYPE_MGMT;
+}
+
+static int rtl8187_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        rtl8187_set_channel(dev, conf->channel);
+
+        rtl818x_iowrite8(priv, &priv->map->SIFS, 0x22);
+
+        if (conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME) {
+                rtl818x_iowrite8(priv, &priv->map->SLOT, 0x9);
+                rtl818x_iowrite8(priv, &priv->map->DIFS, 0x14);
+                rtl818x_iowrite8(priv, &priv->map->EIFS, 91 - 0x14);
+                rtl818x_iowrite8(priv, &priv->map->CW_VAL, 0x73);
+        } else {
+                rtl818x_iowrite8(priv, &priv->map->SLOT, 0x14);
+                rtl818x_iowrite8(priv, &priv->map->DIFS, 0x24);
+                rtl818x_iowrite8(priv, &priv->map->EIFS, 91 - 0x24);
+                rtl818x_iowrite8(priv, &priv->map->CW_VAL, 0xa5);
+        }
+
+        rtl818x_iowrite16(priv, &priv->map->ATIM_WND, 2);
+        rtl818x_iowrite16(priv, &priv->map->ATIMTR_INTERVAL, 100);
+        rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL, 100);
+        rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL_TIME, 100);
+        return 0;
+}
+
+static int rtl8187_config_interface(struct ieee80211_hw *dev, int if_id,
+                                    struct ieee80211_if_conf *conf)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        int i;
+
+        for (i = 0; i < ETH_ALEN; i++)
+                rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
+
+        if (is_valid_ether_addr(conf->bssid))
+                rtl818x_iowrite8(priv, &priv->map->MSR, RTL818X_MSR_INFRA);
+        else
+                rtl818x_iowrite8(priv, &priv->map->MSR, RTL818X_MSR_NO_LINK);
+
+        return 0;
+}
+
+static const struct ieee80211_ops rtl8187_ops = {
+        .tx                     = rtl8187_tx,
+        .open                   = rtl8187_open,
+        .stop                   = rtl8187_stop,
+        .add_interface          = rtl8187_add_interface,
+        .remove_interface       = rtl8187_remove_interface,
+        .config                 = rtl8187_config,
+        .config_interface       = rtl8187_config_interface,
+};
+
+static void rtl8187_eeprom_register_read(struct eeprom_93cx6 *eeprom)
+{
+        struct ieee80211_hw *dev = eeprom->data;
+        struct rtl8187_priv *priv = dev->priv;
+        u8 reg = rtl818x_ioread8(priv, &priv->map->EEPROM_CMD);
+
+        eeprom->reg_data_in = reg & RTL818X_EEPROM_CMD_WRITE;
+        eeprom->reg_data_out = reg & RTL818X_EEPROM_CMD_READ;
+        eeprom->reg_data_clock = reg & RTL818X_EEPROM_CMD_CK;
+        eeprom->reg_chip_select = reg & RTL818X_EEPROM_CMD_CS;
+}
+
+static void rtl8187_eeprom_register_write(struct eeprom_93cx6 *eeprom)
+{
+        struct ieee80211_hw *dev = eeprom->data;
+        struct rtl8187_priv *priv = dev->priv;
+        u8 reg = RTL818X_EEPROM_CMD_PROGRAM;
+
+        if (eeprom->reg_data_in)
+                reg |= RTL818X_EEPROM_CMD_WRITE;
+        if (eeprom->reg_data_out)
+                reg |= RTL818X_EEPROM_CMD_READ;
+        if (eeprom->reg_data_clock)
+                reg |= RTL818X_EEPROM_CMD_CK;
+        if (eeprom->reg_chip_select)
+                reg |= RTL818X_EEPROM_CMD_CS;
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, reg);
+        udelay(10);
+}
+
+static int __devinit rtl8187_probe(struct usb_interface *intf,
+                                   const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct ieee80211_hw *dev;
+        struct rtl8187_priv *priv;
+        struct eeprom_93cx6 eeprom;
+        struct ieee80211_channel *channel;
+        u16 txpwr, reg;
+        int err, i;
+
+        dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops);
+        if (!dev) {
+                printk(KERN_ERR "rtl8187: ieee80211 alloc failed\n");
+                return -ENOMEM;
+        }
+
+        priv = dev->priv;
+
+        SET_IEEE80211_DEV(dev, &intf->dev);
+        usb_set_intfdata(intf, dev);
+        priv->udev = udev;
+
+        usb_get_dev(udev);
+
+        skb_queue_head_init(&priv->rx_queue);
+        memcpy(priv->channels, rtl818x_channels, sizeof(rtl818x_channels));
+        memcpy(priv->rates, rtl818x_rates, sizeof(rtl818x_rates));
+        priv->map = (struct rtl818x_csr *)0xFF00;
+        priv->modes[0].mode = MODE_IEEE80211G;
+        priv->modes[0].num_rates = ARRAY_SIZE(rtl818x_rates);
+        priv->modes[0].rates = priv->rates;
+        priv->modes[0].num_channels = ARRAY_SIZE(rtl818x_channels);
+        priv->modes[0].channels = priv->channels;
+        priv->modes[1].mode = MODE_IEEE80211B;
+        priv->modes[1].num_rates = 4;
+        priv->modes[1].rates = priv->rates;
+        priv->modes[1].num_channels = ARRAY_SIZE(rtl818x_channels);
+        priv->modes[1].channels = priv->channels;
+        priv->mode = IEEE80211_IF_TYPE_MGMT;
+        dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+                     IEEE80211_HW_RX_INCLUDES_FCS |
+                     IEEE80211_HW_WEP_INCLUDE_IV |
+                     IEEE80211_HW_DATA_NULLFUNC_ACK;
+        dev->extra_tx_headroom = sizeof(struct rtl8187_tx_hdr);
+        dev->queues = 1;
+        dev->max_rssi = 65;
+        dev->max_signal = 64;
+
+        for (i = 0; i < 2; i++)
+                if ((err = ieee80211_register_hwmode(dev, &priv->modes[i])))
+                        goto err_free_dev;
+
+        eeprom.data = dev;
+        eeprom.register_read = rtl8187_eeprom_register_read;
+        eeprom.register_write = rtl8187_eeprom_register_write;
+        if (rtl818x_ioread32(priv, &priv->map->RX_CONF) & (1 << 6))
+                eeprom.width = PCI_EEPROM_WIDTH_93C66;
+        else
+                eeprom.width = PCI_EEPROM_WIDTH_93C46;
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        udelay(10);
+
+        eeprom_93cx6_multiread(&eeprom, RTL8187_EEPROM_MAC_ADDR,
+                               (__le16 __force *)dev->wiphy->perm_addr, 3);
+        if (!is_valid_ether_addr(dev->wiphy->perm_addr)) {
+                printk(KERN_WARNING "rtl8187: Invalid hwaddr! Using randomly "
+                       "generated MAC address\n");
+                random_ether_addr(dev->wiphy->perm_addr);
+        }
+
+        channel = priv->channels;
+        for (i = 0; i < 3; i++) {
+                eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_CHAN_1 + i,
+                                  &txpwr);
+                (*channel++).val = txpwr & 0xFF;
+                (*channel++).val = txpwr >> 8;
+        }
+        for (i = 0; i < 2; i++) {
+                eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_CHAN_4 + i,
+                                  &txpwr);
+                (*channel++).val = txpwr & 0xFF;
+                (*channel++).val = txpwr >> 8;
+        }
+        for (i = 0; i < 2; i++) {
+                eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_CHAN_6 + i,
+                                  &txpwr);
+                (*channel++).val = txpwr & 0xFF;
+                (*channel++).val = txpwr >> 8;
+        }
+
+        eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_BASE,
+                          &priv->txpwr_base);
+
+        reg = rtl818x_ioread16(priv, &priv->map->PGSELECT) & ~1;
+        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg | 1);
+        /* 0 means asic B-cut, we should use SW 3 wire
+         * bit-by-bit banging for radio. 1 means we can use
+         * USB specific request to write radio registers */
+        priv->asic_rev = rtl818x_ioread8(priv, (u8 *)0xFFFE) & 0x3;
+        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        rtl8225_write(dev, 0, 0x1B7);
+
+        if (rtl8225_read(dev, 8) != 0x588 || rtl8225_read(dev, 9) != 0x700)
+                priv->rf_init = rtl8225_rf_init;
+        else
+                priv->rf_init = rtl8225z2_rf_init;
+
+        rtl8225_write(dev, 0, 0x0B7);
+
+        err = ieee80211_register_hw(dev);
+        if (err) {
+                printk(KERN_ERR "rtl8187: Cannot register device\n");
+                goto err_free_dev;
+        }
+
+        printk(KERN_INFO "%s: hwaddr " MAC_FMT ", rtl8187 V%d + %s\n",
+               wiphy_name(dev->wiphy), MAC_ARG(dev->wiphy->perm_addr),
+               priv->asic_rev, priv->rf_init == rtl8225_rf_init ?
+               "rtl8225" : "rtl8225z2");
+
+        return 0;
+
+ err_free_dev:
+        ieee80211_free_hw(dev);
+        usb_set_intfdata(intf, NULL);
+        usb_put_dev(udev);
+        return err;
+}
+
+static void __devexit rtl8187_disconnect(struct usb_interface *intf)
+{
+        struct ieee80211_hw *dev = usb_get_intfdata(intf);
+        struct rtl8187_priv *priv;
+
+        if (!dev)
+                return;
+
+        ieee80211_unregister_hw(dev);
+
+        priv = dev->priv;
+        usb_put_dev(interface_to_usbdev(intf));
+        ieee80211_free_hw(dev);
+}
+
+static struct usb_driver rtl8187_driver = {
+        .name           = KBUILD_MODNAME,
+        .id_table       = rtl8187_table,
+        .probe          = rtl8187_probe,
+        .disconnect     = rtl8187_disconnect,
+};
+
+static int __init rtl8187_init(void)
+{
+        return usb_register(&rtl8187_driver);
+}
+
+static void __exit rtl8187_exit(void)
+{
+        usb_deregister(&rtl8187_driver);
+}
+
+module_init(rtl8187_init);
+module_exit(rtl8187_exit);
diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c
new file mode 100644
index 000000000000..e25a09f1b068
--- /dev/null
+++ b/drivers/net/wireless/rtl8187_rtl8225.c
@@ -0,0 +1,745 @@
+/*
+ * Radio tuning for RTL8225 on RTL8187
+ *
+ * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
+ *
+ * Based on the r8187 driver, which is:
+ * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ *
+ * Magic delays, register offsets, and phy value tables below are
+ * taken from the original r8187 driver sources.  Thanks to Realtek
+ * for their support!
+ *
+ * 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.
+ */
+
+#include <linux/init.h>
+#include <linux/usb.h>
+#include <net/mac80211.h>
+
+#include "rtl8187.h"
+#include "rtl8187_rtl8225.h"
+
+static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u16 reg80, reg84, reg82;
+        u32 bangdata;
+        int i;
+
+        bangdata = (data << 4) | (addr & 0xf);
+
+        reg80 = rtl818x_ioread16(priv, &priv->map->RFPinsOutput) & 0xfff3;
+        reg82 = rtl818x_ioread16(priv, &priv->map->RFPinsEnable);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, reg82 | 0x7);
+
+        reg84 = rtl818x_ioread16(priv, &priv->map->RFPinsSelect);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84 | 0x7);
+        udelay(10);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        udelay(2);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80);
+        udelay(10);
+
+        for (i = 15; i >= 0; i--) {
+                u16 reg = reg80 | (bangdata & (1 << i)) >> i;
+
+                if (i & 1)
+                        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);
+
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg | (1 << 1));
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg | (1 << 1));
+
+                if (!(i & 1))
+                        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);
+        }
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        udelay(10);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84);
+        msleep(2);
+}
+
+static void rtl8225_write_8051(struct ieee80211_hw *dev, u8 addr, u16 data)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u16 reg80, reg82, reg84;
+
+        reg80 = rtl818x_ioread16(priv, &priv->map->RFPinsOutput);
+        reg82 = rtl818x_ioread16(priv, &priv->map->RFPinsEnable);
+        reg84 = rtl818x_ioread16(priv, &priv->map->RFPinsSelect);
+
+        reg80 &= ~(0x3 << 2);
+        reg84 &= ~0xF;
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, reg82 | 0x0007);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84 | 0x0007);
+        udelay(10);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        udelay(2);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80);
+        udelay(10);
+
+        usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),
+                        RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,
+                        addr, 0x8225, &data, sizeof(data), HZ / 2);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        udelay(10);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84);
+        msleep(2);
+}
+
+void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
+{
+        struct rtl8187_priv *priv = dev->priv;
+
+        if (priv->asic_rev)
+                rtl8225_write_8051(dev, addr, data);
+        else
+                rtl8225_write_bitbang(dev, addr, data);
+}
+
+u16 rtl8225_read(struct ieee80211_hw *dev, u8 addr)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u16 reg80, reg82, reg84, out;
+        int i;
+
+        reg80 = rtl818x_ioread16(priv, &priv->map->RFPinsOutput);
+        reg82 = rtl818x_ioread16(priv, &priv->map->RFPinsEnable);
+        reg84 = rtl818x_ioread16(priv, &priv->map->RFPinsSelect);
+
+        reg80 &= ~0xF;
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, reg82 | 0x000F);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84 | 0x000F);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
+        udelay(4);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80);
+        udelay(5);
+
+        for (i = 4; i >= 0; i--) {
+                u16 reg = reg80 | ((addr >> i) & 1);
+
+                if (!(i & 1)) {
+                        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);
+                        udelay(1);
+                }
+
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg | (1 << 1));
+                udelay(2);
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg | (1 << 1));
+                udelay(2);
+
+                if (i & 1) {
+                        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);
+                        udelay(1);
+                }
+        }
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                          reg80 | (1 << 3) | (1 << 1));
+        udelay(2);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                          reg80 | (1 << 3));
+        udelay(2);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                          reg80 | (1 << 3));
+        udelay(2);
+
+        out = 0;
+        for (i = 11; i >= 0; i--) {
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg80 | (1 << 3));
+                udelay(1);
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg80 | (1 << 3) | (1 << 1));
+                udelay(2);
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg80 | (1 << 3) | (1 << 1));
+                udelay(2);
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg80 | (1 << 3) | (1 << 1));
+                udelay(2);
+
+                if (rtl818x_ioread16(priv, &priv->map->RFPinsInput) & (1 << 1))
+                        out |= 1 << i;
+
+                rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                                  reg80 | (1 << 3));
+                udelay(2);
+        }
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput,
+                          reg80 | (1 << 3) | (1 << 2));
+        udelay(2);
+
+        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, reg82);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84);
+        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x03A0);
+
+        return out;
+}
+
+static const u16 rtl8225bcd_rxgain[] = {
+        0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
+        0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,
+        0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583,
+        0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644,
+        0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688,
+        0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745,
+        0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789,
+        0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793,
+        0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,
+        0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,
+        0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07b0, 0x07b1, 0x07b2, 0x07b3,
+        0x07b4, 0x07b5, 0x07b8, 0x07b9, 0x07ba, 0x07bb, 0x07bb
+};
+
+static const u8 rtl8225_agc[] = {
+        0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e,
+        0x9d, 0x9c, 0x9b, 0x9a, 0x99, 0x98, 0x97, 0x96,
+        0x95, 0x94, 0x93, 0x92, 0x91, 0x90, 0x8f, 0x8e,
+        0x8d, 0x8c, 0x8b, 0x8a, 0x89, 0x88, 0x87, 0x86,
+        0x85, 0x84, 0x83, 0x82, 0x81, 0x80, 0x3f, 0x3e,
+        0x3d, 0x3c, 0x3b, 0x3a, 0x39, 0x38, 0x37, 0x36,
+        0x35, 0x34, 0x33, 0x32, 0x31, 0x30, 0x2f, 0x2e,
+        0x2d, 0x2c, 0x2b, 0x2a, 0x29, 0x28, 0x27, 0x26,
+        0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1f, 0x1e,
+        0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16,
+        0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e,
+        0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06,
+        0x05, 0x04, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
+};
+
+static const u8 rtl8225_gain[] = {
+        0x23, 0x88, 0x7c, 0xa5, /* -82dBm */
+        0x23, 0x88, 0x7c, 0xb5, /* -82dBm */
+        0x23, 0x88, 0x7c, 0xc5, /* -82dBm */
+        0x33, 0x80, 0x79, 0xc5, /* -78dBm */
+        0x43, 0x78, 0x76, 0xc5, /* -74dBm */
+        0x53, 0x60, 0x73, 0xc5, /* -70dBm */
+        0x63, 0x58, 0x70, 0xc5, /* -66dBm */
+};
+
+static const u8 rtl8225_threshold[] = {
+        0x8d, 0x8d, 0x8d, 0x8d, 0x9d, 0xad, 0xbd
+};
+
+static const u8 rtl8225_tx_gain_cck_ofdm[] = {
+        0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x7e
+};
+
+static const u8 rtl8225_tx_power_cck[] = {
+        0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02,
+        0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02,
+        0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02,
+        0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02,
+        0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03,
+        0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03
+};
+
+static const u8 rtl8225_tx_power_cck_ch14[] = {
+        0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00,
+        0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00,
+        0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00,
+        0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00,
+        0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00,
+        0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00
+};
+
+static const u8 rtl8225_tx_power_ofdm[] = {
+        0x80, 0x90, 0xa2, 0xb5, 0xcb, 0xe4
+};
+
+static const u32 rtl8225_chan[] = {
+        0x085c, 0x08dc, 0x095c, 0x09dc, 0x0a5c, 0x0adc, 0x0b5c,
+        0x0bdc, 0x0c5c, 0x0cdc, 0x0d5c, 0x0ddc, 0x0e5c, 0x0f72
+};
+
+static void rtl8225_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u8 cck_power, ofdm_power;
+        const u8 *tmp;
+        u32 reg;
+        int i;
+
+        cck_power = priv->channels[channel - 1].val & 0xF;
+        ofdm_power = priv->channels[channel - 1].val >> 4;
+
+        cck_power = min(cck_power, (u8)11);
+        ofdm_power = min(ofdm_power, (u8)35);
+
+        rtl818x_iowrite8(priv, &priv->map->TX_GAIN_CCK,
+                         rtl8225_tx_gain_cck_ofdm[cck_power / 6] >> 1);
+
+        if (channel == 14)
+                tmp = &rtl8225_tx_power_cck_ch14[(cck_power % 6) * 8];
+        else
+                tmp = &rtl8225_tx_power_cck[(cck_power % 6) * 8];
+
+        for (i = 0; i < 8; i++)
+                rtl8225_write_phy_cck(dev, 0x44 + i, *tmp++);
+
+        msleep(1); // FIXME: optional?
+
+        /* anaparam2 on */
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_ON);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        rtl8225_write_phy_ofdm(dev, 2, 0x42);
+        rtl8225_write_phy_ofdm(dev, 6, 0x00);
+        rtl8225_write_phy_ofdm(dev, 8, 0x00);
+
+        rtl818x_iowrite8(priv, &priv->map->TX_GAIN_OFDM,
+                         rtl8225_tx_gain_cck_ofdm[ofdm_power / 6] >> 1);
+
+        tmp = &rtl8225_tx_power_ofdm[ofdm_power % 6];
+
+        rtl8225_write_phy_ofdm(dev, 5, *tmp);
+        rtl8225_write_phy_ofdm(dev, 7, *tmp);
+
+        msleep(1);
+}
+
+void rtl8225_rf_init(struct ieee80211_hw *dev)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        int i;
+
+        rtl8225_write(dev, 0x0, 0x067); msleep(1);
+        rtl8225_write(dev, 0x1, 0xFE0); msleep(1);
+        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
+        rtl8225_write(dev, 0x3, 0x441); msleep(1);
+        rtl8225_write(dev, 0x4, 0x486); msleep(1);
+        rtl8225_write(dev, 0x5, 0xBC0); msleep(1);
+        rtl8225_write(dev, 0x6, 0xAE6); msleep(1);
+        rtl8225_write(dev, 0x7, 0x82A); msleep(1);
+        rtl8225_write(dev, 0x8, 0x01F); msleep(1);
+        rtl8225_write(dev, 0x9, 0x334); msleep(1);
+        rtl8225_write(dev, 0xA, 0xFD4); msleep(1);
+        rtl8225_write(dev, 0xB, 0x391); msleep(1);
+        rtl8225_write(dev, 0xC, 0x050); msleep(1);
+        rtl8225_write(dev, 0xD, 0x6DB); msleep(1);
+        rtl8225_write(dev, 0xE, 0x029); msleep(1);
+        rtl8225_write(dev, 0xF, 0x914); msleep(100);
+
+        rtl8225_write(dev, 0x2, 0xC4D); msleep(200);
+        rtl8225_write(dev, 0x2, 0x44D); msleep(200);
+
+        if (!(rtl8225_read(dev, 6) & (1 << 7))) {
+                rtl8225_write(dev, 0x02, 0x0c4d);
+                msleep(200);
+                rtl8225_write(dev, 0x02, 0x044d);
+                msleep(100);
+                if (!(rtl8225_read(dev, 6) & (1 << 7)))
+                        printk(KERN_WARNING "%s: RF Calibration Failed! %x\n",
+                               wiphy_name(dev->wiphy), rtl8225_read(dev, 6));
+        }
+
+        rtl8225_write(dev, 0x0, 0x127);
+
+        for (i = 0; i < ARRAY_SIZE(rtl8225bcd_rxgain); i++) {
+                rtl8225_write(dev, 0x1, i + 1);
+                rtl8225_write(dev, 0x2, rtl8225bcd_rxgain[i]);
+        }
+
+        rtl8225_write(dev, 0x0, 0x027);
+        rtl8225_write(dev, 0x0, 0x22F);
+
+        for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) {
+                rtl8225_write_phy_ofdm(dev, 0xB, rtl8225_agc[i]);
+                msleep(1);
+                rtl8225_write_phy_ofdm(dev, 0xA, 0x80 + i);
+                msleep(1);
+        }
+
+        msleep(1);
+
+        rtl8225_write_phy_ofdm(dev, 0x00, 0x01); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x01, 0x02); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x02, 0x42); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x03, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x04, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x05, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x06, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x07, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x08, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x09, 0xfe); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0a, 0x09); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0b, 0x80); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0c, 0x01); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0f, 0x38); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x10, 0x84); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x11, 0x06); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x12, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x13, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x14, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x15, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x16, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x17, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x18, 0xef); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x19, 0x19); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1a, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1b, 0x76); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1c, 0x04); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1e, 0x95); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1f, 0x75); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x20, 0x1f); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x21, 0x27); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x22, 0x16); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x24, 0x46); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x25, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x27, 0x88); msleep(1);
+
+        rtl8225_write_phy_ofdm(dev, 0x0d, rtl8225_gain[2 * 4]);
+        rtl8225_write_phy_ofdm(dev, 0x1b, rtl8225_gain[2 * 4 + 2]);
+        rtl8225_write_phy_ofdm(dev, 0x1d, rtl8225_gain[2 * 4 + 3]);
+        rtl8225_write_phy_ofdm(dev, 0x23, rtl8225_gain[2 * 4 + 1]);
+
+        rtl8225_write_phy_cck(dev, 0x00, 0x98); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x03, 0x20); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x04, 0x7e); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x05, 0x12); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x06, 0xfc); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x07, 0x78); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x08, 0x2e); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x11, 0x88); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x12, 0x47); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x13, 0xd0);
+        rtl8225_write_phy_cck(dev, 0x19, 0x00);
+        rtl8225_write_phy_cck(dev, 0x1a, 0xa0);
+        rtl8225_write_phy_cck(dev, 0x1b, 0x08);
+        rtl8225_write_phy_cck(dev, 0x40, 0x86);
+        rtl8225_write_phy_cck(dev, 0x41, 0x8d); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x42, 0x15); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x43, 0x18); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x44, 0x1f); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x45, 0x1e); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x46, 0x1a); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x47, 0x15); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x48, 0x10); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x49, 0x0a); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x4a, 0x05); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x4b, 0x02); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x4c, 0x05); msleep(1);
+
+        rtl818x_iowrite8(priv, &priv->map->TESTR, 0x0D);
+
+        rtl8225_rf_set_tx_power(dev, 1);
+
+        /* RX antenna default to A */
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);      /* B: 0xDB */
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);     /* B: 0x10 */
+
+        rtl818x_iowrite8(priv, &priv->map->TX_ANTENNA, 0x03);   /* B: 0x00 */
+        msleep(1);
+        rtl818x_iowrite32(priv, (__le32 *)0xFF94, 0x3dc00002);
+
+        /* set sensitivity */
+        rtl8225_write(dev, 0x0c, 0x50);
+        rtl8225_write_phy_ofdm(dev, 0x0d, rtl8225_gain[2 * 4]);
+        rtl8225_write_phy_ofdm(dev, 0x1b, rtl8225_gain[2 * 4 + 2]);
+        rtl8225_write_phy_ofdm(dev, 0x1d, rtl8225_gain[2 * 4 + 3]);
+        rtl8225_write_phy_ofdm(dev, 0x23, rtl8225_gain[2 * 4 + 1]);
+        rtl8225_write_phy_cck(dev, 0x41, rtl8225_threshold[2]);
+}
+
+static const u8 rtl8225z2_tx_power_cck_ch14[] = {
+        0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00
+};
+
+static const u8 rtl8225z2_tx_power_cck[] = {
+        0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04
+};
+
+static const u8 rtl8225z2_tx_power_ofdm[] = {
+        0x42, 0x00, 0x40, 0x00, 0x40
+};
+
+static const u8 rtl8225z2_tx_gain_cck_ofdm[] = {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+        0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
+        0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+        0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
+        0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23
+};
+
+static void rtl8225z2_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        u8 cck_power, ofdm_power;
+        const u8 *tmp;
+        u32 reg;
+        int i;
+
+        cck_power = priv->channels[channel - 1].val & 0xF;
+        ofdm_power = priv->channels[channel - 1].val >> 4;
+
+        cck_power = min(cck_power, (u8)15);
+        cck_power += priv->txpwr_base & 0xF;
+        cck_power = min(cck_power, (u8)35);
+
+        ofdm_power = min(ofdm_power, (u8)15);
+        ofdm_power += priv->txpwr_base >> 4;
+        ofdm_power = min(ofdm_power, (u8)35);
+
+        if (channel == 14)
+                tmp = rtl8225z2_tx_power_cck_ch14;
+        else
+                tmp = rtl8225z2_tx_power_cck;
+
+        for (i = 0; i < 8; i++)
+                rtl8225_write_phy_cck(dev, 0x44 + i, *tmp++);
+
+        rtl818x_iowrite8(priv, &priv->map->TX_GAIN_CCK,
+                         rtl8225z2_tx_gain_cck_ofdm[cck_power]);
+        msleep(1);
+
+        /* anaparam2 on */
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_ON);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
+        rtl8225_write_phy_ofdm(dev, 2, 0x42);
+        rtl8225_write_phy_ofdm(dev, 5, 0x00);
+        rtl8225_write_phy_ofdm(dev, 6, 0x40);
+        rtl8225_write_phy_ofdm(dev, 7, 0x00);
+        rtl8225_write_phy_ofdm(dev, 8, 0x40);
+
+        rtl818x_iowrite8(priv, &priv->map->TX_GAIN_OFDM,
+                         rtl8225z2_tx_gain_cck_ofdm[ofdm_power]);
+        msleep(1);
+}
+
+static const u16 rtl8225z2_rxgain[] = {
+        0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
+        0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,
+        0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583,
+        0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644,
+        0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688,
+        0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745,
+        0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789,
+        0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793,
+        0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,
+        0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,
+        0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,
+        0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb
+};
+
+static const u8 rtl8225z2_gain_bg[] = {
+        0x23, 0x15, 0xa5, /* -82-1dBm */
+        0x23, 0x15, 0xb5, /* -82-2dBm */
+        0x23, 0x15, 0xc5, /* -82-3dBm */
+        0x33, 0x15, 0xc5, /* -78dBm */
+        0x43, 0x15, 0xc5, /* -74dBm */
+        0x53, 0x15, 0xc5, /* -70dBm */
+        0x63, 0x15, 0xc5  /* -66dBm */
+};
+
+void rtl8225z2_rf_init(struct ieee80211_hw *dev)
+{
+        struct rtl8187_priv *priv = dev->priv;
+        int i;
+
+        rtl8225_write(dev, 0x0, 0x2BF); msleep(1);
+        rtl8225_write(dev, 0x1, 0xEE0); msleep(1);
+        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
+        rtl8225_write(dev, 0x3, 0x441); msleep(1);
+        rtl8225_write(dev, 0x4, 0x8C3); msleep(1);
+        rtl8225_write(dev, 0x5, 0xC72); msleep(1);
+        rtl8225_write(dev, 0x6, 0x0E6); msleep(1);
+        rtl8225_write(dev, 0x7, 0x82A); msleep(1);
+        rtl8225_write(dev, 0x8, 0x03F); msleep(1);
+        rtl8225_write(dev, 0x9, 0x335); msleep(1);
+        rtl8225_write(dev, 0xa, 0x9D4); msleep(1);
+        rtl8225_write(dev, 0xb, 0x7BB); msleep(1);
+        rtl8225_write(dev, 0xc, 0x850); msleep(1);
+        rtl8225_write(dev, 0xd, 0xCDF); msleep(1);
+        rtl8225_write(dev, 0xe, 0x02B); msleep(1);
+        rtl8225_write(dev, 0xf, 0x114); msleep(100);
+
+        rtl8225_write(dev, 0x0, 0x1B7);
+
+        for (i = 0; i < ARRAY_SIZE(rtl8225z2_rxgain); i++) {
+                rtl8225_write(dev, 0x1, i + 1);
+                rtl8225_write(dev, 0x2, rtl8225z2_rxgain[i]);
+        }
+
+        rtl8225_write(dev, 0x3, 0x080);
+        rtl8225_write(dev, 0x5, 0x004);
+        rtl8225_write(dev, 0x0, 0x0B7);
+        rtl8225_write(dev, 0x2, 0xc4D);
+
+        msleep(200);
+        rtl8225_write(dev, 0x2, 0x44D);
+        msleep(100);
+
+        if (!(rtl8225_read(dev, 6) & (1 << 7))) {
+                rtl8225_write(dev, 0x02, 0x0C4D);
+                msleep(200);
+                rtl8225_write(dev, 0x02, 0x044D);
+                msleep(100);
+                if (!(rtl8225_read(dev, 6) & (1 << 7)))
+                        printk(KERN_WARNING "%s: RF Calibration Failed! %x\n",
+                               wiphy_name(dev->wiphy), rtl8225_read(dev, 6));
+        }
+
+        msleep(200);
+
+        rtl8225_write(dev, 0x0, 0x2BF);
+
+        for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) {
+                rtl8225_write_phy_ofdm(dev, 0xB, rtl8225_agc[i]);
+                msleep(1);
+                rtl8225_write_phy_ofdm(dev, 0xA, 0x80 + i);
+                msleep(1);
+        }
+
+        msleep(1);
+
+        rtl8225_write_phy_ofdm(dev, 0x00, 0x01); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x01, 0x02); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x02, 0x42); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x03, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x04, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x05, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x06, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x07, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x08, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x09, 0xfe); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0a, 0x08); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0b, 0x80); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0c, 0x01); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0d, 0x43);
+        rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0f, 0x38); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x10, 0x84); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x11, 0x07); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x12, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x13, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x14, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x15, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x16, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x17, 0x40); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x18, 0xef); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x19, 0x19); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1a, 0x20); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1b, 0x15); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1c, 0x04); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1d, 0xc5); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1e, 0x95); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x1f, 0x75); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x20, 0x1f); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x21, 0x17); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x22, 0x16); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x23, 0x80); msleep(1); //FIXME: not needed?
+        rtl8225_write_phy_ofdm(dev, 0x24, 0x46); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x25, 0x00); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x27, 0x88); msleep(1);
+
+        rtl8225_write_phy_ofdm(dev, 0x0b, rtl8225z2_gain_bg[4 * 3]);
+        rtl8225_write_phy_ofdm(dev, 0x1b, rtl8225z2_gain_bg[4 * 3 + 1]);
+        rtl8225_write_phy_ofdm(dev, 0x1d, rtl8225z2_gain_bg[4 * 3 + 2]);
+        rtl8225_write_phy_ofdm(dev, 0x21, 0x37);
+
+        rtl8225_write_phy_cck(dev, 0x00, 0x98); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x03, 0x20); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x04, 0x7e); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x05, 0x12); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x06, 0xfc); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x07, 0x78); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x08, 0x2e); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x11, 0x88); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x12, 0x47); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x13, 0xd0);
+        rtl8225_write_phy_cck(dev, 0x19, 0x00);
+        rtl8225_write_phy_cck(dev, 0x1a, 0xa0);
+        rtl8225_write_phy_cck(dev, 0x1b, 0x08);
+        rtl8225_write_phy_cck(dev, 0x40, 0x86);
+        rtl8225_write_phy_cck(dev, 0x41, 0x8d); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x42, 0x15); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x43, 0x18); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x44, 0x36); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x45, 0x35); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x46, 0x2e); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x47, 0x25); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x48, 0x1c); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x49, 0x12); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x4a, 0x09); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x4b, 0x04); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x4c, 0x05); msleep(1);
+
+        rtl818x_iowrite8(priv, (u8 *)0xFF5B, 0x0D); msleep(1);
+
+        rtl8225z2_rf_set_tx_power(dev, 1);
+
+        /* RX antenna default to A */
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);      /* B: 0xDB */
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);     /* B: 0x10 */
+
+        rtl818x_iowrite8(priv, &priv->map->TX_ANTENNA, 0x03);   /* B: 0x00 */
+        msleep(1);
+        rtl818x_iowrite32(priv, (__le32 *)0xFF94, 0x3dc00002);
+}
+
+void rtl8225_rf_stop(struct ieee80211_hw *dev)
+{
+        u8 reg;
+        struct rtl8187_priv *priv = dev->priv;
+
+        rtl8225_write(dev, 0x4, 0x1f); msleep(1);
+
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
+        reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_OFF);
+        rtl818x_iowrite32(priv, &priv->map->ANAPARAM, RTL8225_ANAPARAM_OFF);
+        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
+        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+}
+
+void rtl8225_rf_set_channel(struct ieee80211_hw *dev, int channel)
+{
+        struct rtl8187_priv *priv = dev->priv;
+
+        if (priv->rf_init == rtl8225_rf_init)
+                rtl8225_rf_set_tx_power(dev, channel);
+        else
+                rtl8225z2_rf_set_tx_power(dev, channel);
+
+        rtl8225_write(dev, 0x7, rtl8225_chan[channel - 1]);
+        msleep(10);
+}
diff --git a/drivers/net/wireless/rtl8187_rtl8225.h b/drivers/net/wireless/rtl8187_rtl8225.h
new file mode 100644
index 000000000000..798ba4a97376
--- /dev/null
+++ b/drivers/net/wireless/rtl8187_rtl8225.h
@@ -0,0 +1,44 @@
+/*
+ * Radio tuning definitions for RTL8225 on RTL8187
+ *
+ * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
+ *
+ * Based on the r8187 driver, which is:
+ * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ *
+ * 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.
+ */
+
+#ifndef RTL8187_RTL8225_H
+#define RTL8187_RTL8225_H
+
+#define RTL8225_ANAPARAM_ON     0xa0000a59
+#define RTL8225_ANAPARAM2_ON    0x860c7312
+#define RTL8225_ANAPARAM_OFF    0xa00beb59
+#define RTL8225_ANAPARAM2_OFF   0x840dec11
+
+void rtl8225_write(struct ieee80211_hw *, u8 addr, u16 data);
+u16  rtl8225_read(struct ieee80211_hw *, u8 addr);
+
+void rtl8225_rf_init(struct ieee80211_hw *);
+void rtl8225z2_rf_init(struct ieee80211_hw *);
+void rtl8225_rf_stop(struct ieee80211_hw *);
+void rtl8225_rf_set_channel(struct ieee80211_hw *, int);
+
+
+static inline void rtl8225_write_phy_ofdm(struct ieee80211_hw *dev,
+                                          u8 addr, u32 data)
+{
+        rtl8187_write_phy(dev, addr, data);
+}
+
+static inline void rtl8225_write_phy_cck(struct ieee80211_hw *dev,
+                                         u8 addr, u32 data)
+{
+        rtl8187_write_phy(dev, addr, data | 0x10000);
+}
+
+#endif /* RTL8187_RTL8225_H */
diff --git a/drivers/net/wireless/rtl818x.h b/drivers/net/wireless/rtl818x.h
new file mode 100644
index 000000000000..283de30628e1
--- /dev/null
+++ b/drivers/net/wireless/rtl818x.h
@@ -0,0 +1,226 @@
+/*
+ * Definitions for RTL818x hardware
+ *
+ * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
+ *
+ * Based on the r8187 driver, which is:
+ * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ *
+ * 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.
+ */
+
+#ifndef RTL818X_H
+#define RTL818X_H
+
+struct rtl818x_csr {
+        u8      MAC[6];
+        u8      reserved_0[2];
+        __le32  MAR[2];
+        u8      RX_FIFO_COUNT;
+        u8      reserved_1;
+        u8      TX_FIFO_COUNT;
+        u8      BQREQ;
+        u8      reserved_2[4];
+        __le32  TSFT[2];
+        __le32  TLPDA;
+        __le32  TNPDA;
+        __le32  THPDA;
+        __le16  BRSR;
+        u8      BSSID[6];
+        u8      RESP_RATE;
+        u8      EIFS;
+        u8      reserved_3[1];
+        u8      CMD;
+#define RTL818X_CMD_TX_ENABLE           (1 << 2)
+#define RTL818X_CMD_RX_ENABLE           (1 << 3)
+#define RTL818X_CMD_RESET               (1 << 4)
+        u8      reserved_4[4];
+        __le16  INT_MASK;
+        __le16  INT_STATUS;
+#define RTL818X_INT_RX_OK               (1 <<  0)
+#define RTL818X_INT_RX_ERR              (1 <<  1)
+#define RTL818X_INT_TXL_OK              (1 <<  2)
+#define RTL818X_INT_TXL_ERR             (1 <<  3)
+#define RTL818X_INT_RX_DU               (1 <<  4)
+#define RTL818X_INT_RX_FO               (1 <<  5)
+#define RTL818X_INT_TXN_OK              (1 <<  6)
+#define RTL818X_INT_TXN_ERR             (1 <<  7)
+#define RTL818X_INT_TXH_OK              (1 <<  8)
+#define RTL818X_INT_TXH_ERR             (1 <<  9)
+#define RTL818X_INT_TXB_OK              (1 << 10)
+#define RTL818X_INT_TXB_ERR             (1 << 11)
+#define RTL818X_INT_ATIM                (1 << 12)
+#define RTL818X_INT_BEACON              (1 << 13)
+#define RTL818X_INT_TIME_OUT            (1 << 14)
+#define RTL818X_INT_TX_FO               (1 << 15)
+        __le32  TX_CONF;
+#define RTL818X_TX_CONF_LOOPBACK_MAC    (1 << 17)
+#define RTL818X_TX_CONF_NO_ICV          (1 << 19)
+#define RTL818X_TX_CONF_DISCW           (1 << 20)
+#define RTL818X_TX_CONF_R8180_ABCD      (2 << 25)
+#define RTL818X_TX_CONF_R8180_F         (3 << 25)
+#define RTL818X_TX_CONF_R8185_ABC       (4 << 25)
+#define RTL818X_TX_CONF_R8185_D         (5 << 25)
+#define RTL818X_TX_CONF_HWVER_MASK      (7 << 25)
+#define RTL818X_TX_CONF_CW_MIN          (1 << 31)
+        __le32  RX_CONF;
+#define RTL818X_RX_CONF_MONITOR         (1 <<  0)
+#define RTL818X_RX_CONF_NICMAC          (1 <<  1)
+#define RTL818X_RX_CONF_MULTICAST       (1 <<  2)
+#define RTL818X_RX_CONF_BROADCAST       (1 <<  3)
+#define RTL818X_RX_CONF_DATA            (1 << 18)
+#define RTL818X_RX_CONF_CTRL            (1 << 19)
+#define RTL818X_RX_CONF_MGMT            (1 << 20)
+#define RTL818X_RX_CONF_BSSID           (1 << 23)
+#define RTL818X_RX_CONF_RX_AUTORESETPHY (1 << 28)
+#define RTL818X_RX_CONF_ONLYERLPKT      (1 << 31)
+        __le32  INT_TIMEOUT;
+        __le32  TBDA;
+        u8      EEPROM_CMD;
+#define RTL818X_EEPROM_CMD_READ         (1 << 0)
+#define RTL818X_EEPROM_CMD_WRITE        (1 << 1)
+#define RTL818X_EEPROM_CMD_CK           (1 << 2)
+#define RTL818X_EEPROM_CMD_CS           (1 << 3)
+#define RTL818X_EEPROM_CMD_NORMAL       (0 << 6)
+#define RTL818X_EEPROM_CMD_LOAD         (1 << 6)
+#define RTL818X_EEPROM_CMD_PROGRAM      (2 << 6)
+#define RTL818X_EEPROM_CMD_CONFIG       (3 << 6)
+        u8      CONFIG0;
+        u8      CONFIG1;
+        u8      CONFIG2;
+        __le32  ANAPARAM;
+        u8      MSR;
+#define RTL818X_MSR_NO_LINK             (0 << 2)
+#define RTL818X_MSR_ADHOC               (1 << 2)
+#define RTL818X_MSR_INFRA               (2 << 2)
+        u8      CONFIG3;
+#define RTL818X_CONFIG3_ANAPARAM_WRITE  (1 << 6)
+        u8      CONFIG4;
+#define RTL818X_CONFIG4_POWEROFF        (1 << 6)
+#define RTL818X_CONFIG4_VCOOFF          (1 << 7)
+        u8      TESTR;
+        u8      reserved_9[2];
+        __le16  PGSELECT;
+        __le32  ANAPARAM2;
+        u8      reserved_10[12];
+        __le16  BEACON_INTERVAL;
+        __le16  ATIM_WND;
+        __le16  BEACON_INTERVAL_TIME;
+        __le16  ATIMTR_INTERVAL;
+        u8      reserved_11[4];
+        u8      PHY[4];
+        __le16  RFPinsOutput;
+        __le16  RFPinsEnable;
+        __le16  RFPinsSelect;
+        __le16  RFPinsInput;
+        __le32  RF_PARA;
+        __le32  RF_TIMING;
+        u8      GP_ENABLE;
+        u8      GPIO;
+        u8      reserved_12[10];
+        u8      TX_AGC_CTL;
+#define RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT         (1 << 0)
+#define RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT       (1 << 1)
+#define RTL818X_TX_AGC_CTL_FEEDBACK_ANT                 (1 << 2)
+        u8      TX_GAIN_CCK;
+        u8      TX_GAIN_OFDM;
+        u8      TX_ANTENNA;
+        u8      reserved_13[16];
+        u8      WPA_CONF;
+        u8      reserved_14[3];
+        u8      SIFS;
+        u8      DIFS;
+        u8      SLOT;
+        u8      reserved_15[5];
+        u8      CW_CONF;
+#define RTL818X_CW_CONF_PERPACKET_CW_SHIFT      (1 << 0)
+#define RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT   (1 << 1)
+        u8      CW_VAL;
+        u8      RATE_FALLBACK;
+        u8      reserved_16[25];
+        u8      CONFIG5;
+        u8      TX_DMA_POLLING;
+        u8      reserved_17[2];
+        __le16  CWR;
+        u8      RETRY_CTR;
+        u8      reserved_18[5];
+        __le32  RDSAR;
+        u8      reserved_19[18];
+        u16     TALLY_CNT;
+        u8      TALLY_SEL;
+} __attribute__((packed));
+
+static const struct ieee80211_rate rtl818x_rates[] = {
+        { .rate = 10,
+          .val = 0,
+          .flags = IEEE80211_RATE_CCK },
+        { .rate = 20,
+          .val = 1,
+          .flags = IEEE80211_RATE_CCK },
+        { .rate = 55,
+          .val = 2,
+          .flags = IEEE80211_RATE_CCK },
+        { .rate = 110,
+          .val = 3,
+          .flags = IEEE80211_RATE_CCK },
+        { .rate = 60,
+          .val = 4,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 90,
+          .val = 5,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 120,
+          .val = 6,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 180,
+          .val = 7,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 240,
+          .val = 8,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 360,
+          .val = 9,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 480,
+          .val = 10,
+          .flags = IEEE80211_RATE_OFDM },
+        { .rate = 540,
+          .val = 11,
+          .flags = IEEE80211_RATE_OFDM },
+};
+
+static const struct ieee80211_channel rtl818x_channels[] = {
+        { .chan = 1,
+          .freq = 2412},
+        { .chan = 2,
+          .freq = 2417},
+        { .chan = 3,
+          .freq = 2422},
+        { .chan = 4,
+          .freq = 2427},
+        { .chan = 5,
+          .freq = 2432},
+        { .chan = 6,
+          .freq = 2437},
+        { .chan = 7,
+          .freq = 2442},
+        { .chan = 8,
+          .freq = 2447},
+        { .chan = 9,
+          .freq = 2452},
+        { .chan = 10,
+          .freq = 2457},
+        { .chan = 11,
+          .freq = 2462},
+        { .chan = 12,
+          .freq = 2467},
+        { .chan = 13,
+          .freq = 2472},
+        { .chan = 14,
+          .freq = 2484}
+};
+
+#endif /* RTL818X_H */
diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile
index 6603ad5be63d..4d505903352c 100644
--- a/drivers/net/wireless/zd1211rw/Makefile
+++ b/drivers/net/wireless/zd1211rw/Makefile
@@ -3,7 +3,7 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw.o
 zd1211rw-objs := zd_chip.o zd_ieee80211.o \
                 zd_mac.o zd_netdev.o \
                 zd_rf_al2230.o zd_rf_rf2959.o \
-                zd_rf_al7230b.o \
+                zd_rf_al7230b.o zd_rf_uw2453.o \
                 zd_rf.o zd_usb.o zd_util.o
 
 ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 95b4a2a26707..5b624bfc01a6 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1253,6 +1253,9 @@ static int update_channel_integration_and_calibration(struct zd_chip *chip,
 {
         int r;
 
+        if (!zd_rf_should_update_pwr_int(&chip->rf))
+                return 0;
+
         r = update_pwr_int(chip, channel);
         if (r)
                 return r;
@@ -1283,7 +1286,7 @@ static int patch_cck_gain(struct zd_chip *chip)
         int r;
         u32 value;
 
-        if (!chip->patch_cck_gain)
+        if (!chip->patch_cck_gain || !zd_rf_should_patch_cck_gain(&chip->rf))
                 return 0;
 
         ZD_ASSERT(mutex_is_locked(&chip->mutex));
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index ce0a5f6da0d2..79d0288c193a 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -608,6 +608,9 @@ enum {
 #define CR_ZD1211B_TXOP                 CTL_REG(0x0b20)
 #define CR_ZD1211B_RETRY_MAX            CTL_REG(0x0b28)
 
+/* Used to detect PLL lock */
+#define UW2453_INTR_REG                 ((zd_addr_t)0x85c1)
+
 #define CWIN_SIZE                       0x007f043f
 
 
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index 549c23bcd6cc..7407409b60b1 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -52,34 +52,38 @@ const char *zd_rf_name(u8 type)
 void zd_rf_init(struct zd_rf *rf)
 {
         memset(rf, 0, sizeof(*rf));
+
+        /* default to update channel integration, as almost all RF's do want
+         * this */
+        rf->update_channel_int = 1;
 }
 
 void zd_rf_clear(struct zd_rf *rf)
 {
+        if (rf->clear)
+                rf->clear(rf);
         ZD_MEMCLEAR(rf, sizeof(*rf));
 }
 
 int zd_rf_init_hw(struct zd_rf *rf, u8 type)
 {
-        int r, t;
+        int r = 0;
+        int t;
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         ZD_ASSERT(mutex_is_locked(&chip->mutex));
         switch (type) {
         case RF2959_RF:
                 r = zd_rf_init_rf2959(rf);
-                if (r)
-                        return r;
                 break;
         case AL2230_RF:
                 r = zd_rf_init_al2230(rf);
-                if (r)
-                        return r;
                 break;
         case AL7230B_RF:
                 r = zd_rf_init_al7230b(rf);
-                if (r)
-                        return r;
+                break;
+        case UW2453_RF:
+                r = zd_rf_init_uw2453(rf);
                 break;
         default:
                 dev_err(zd_chip_dev(chip),
@@ -88,6 +92,9 @@ int zd_rf_init_hw(struct zd_rf *rf, u8 type)
                 return -ENODEV;
         }
 
+        if (r)
+                return r;
+
         rf->type = type;
 
         r = zd_chip_lock_phy_regs(chip);
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h
index aa9cc105ce60..c6dfd8227f6e 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.h
+++ b/drivers/net/wireless/zd1211rw/zd_rf.h
@@ -48,12 +48,26 @@ struct zd_rf {
 
         u8 channel;
 
+        /* whether channel integration and calibration should be updated
+         * defaults to 1 (yes) */
+        u8 update_channel_int:1;
+
+        /* whether CR47 should be patched from the EEPROM, if the appropriate
+         * flag is set in the POD. The vendor driver suggests that this should
+         * be done for all RF's, but a bug in their code prevents but their
+         * HW_OverWritePhyRegFromE2P() routine from ever taking effect. */
+        u8 patch_cck_gain:1;
+
+        /* private RF driver data */
+        void *priv;
+
         /* RF-specific functions */
         int (*init_hw)(struct zd_rf *rf);
         int (*set_channel)(struct zd_rf *rf, u8 channel);
         int (*switch_radio_on)(struct zd_rf *rf);
         int (*switch_radio_off)(struct zd_rf *rf);
         int (*patch_6m_band_edge)(struct zd_rf *rf, u8 channel);
+        void (*clear)(struct zd_rf *rf);
 };
 
 const char *zd_rf_name(u8 type);
@@ -71,10 +85,24 @@ int zd_switch_radio_off(struct zd_rf *rf);
 int zd_rf_patch_6m_band_edge(struct zd_rf *rf, u8 channel);
 int zd_rf_generic_patch_6m(struct zd_rf *rf, u8 channel);
 
+static inline int zd_rf_should_update_pwr_int(struct zd_rf *rf)
+{
+        return rf->update_channel_int;
+}
+
+static inline int zd_rf_should_patch_cck_gain(struct zd_rf *rf)
+{
+        return rf->patch_cck_gain;
+}
+
+int zd_rf_patch_6m_band_edge(struct zd_rf *rf, u8 channel);
+int zd_rf_generic_patch_6m(struct zd_rf *rf, u8 channel);
+
 /* Functions for individual RF chips */
 
 int zd_rf_init_rf2959(struct zd_rf *rf);
 int zd_rf_init_al2230(struct zd_rf *rf);
 int zd_rf_init_al7230b(struct zd_rf *rf);
+int zd_rf_init_uw2453(struct zd_rf *rf);
 
 #endif /* _ZD_RF_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
index 511392acfedf..e7a4ecf7b6e2 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -432,5 +432,6 @@ int zd_rf_init_al2230(struct zd_rf *rf)
                 rf->switch_radio_on = zd1211_al2230_switch_radio_on;
         }
         rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
+        rf->patch_cck_gain = 1;
         return 0;
 }
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index 5e5e9ddc6a74..f4e8b6ada854 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -483,6 +483,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
                 rf->switch_radio_on = zd1211_al7230b_switch_radio_on;
                 rf->set_channel = zd1211_al7230b_set_channel;
                 rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
+                rf->patch_cck_gain = 1;
         }
 
         rf->switch_radio_off = al7230b_switch_radio_off;
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
new file mode 100644
index 000000000000..414e40d571ab
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
@@ -0,0 +1,534 @@
+/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+
+#include "zd_rf.h"
+#include "zd_usb.h"
+#include "zd_chip.h"
+
+/* This RF programming code is based upon the code found in v2.16.0.0 of the
+ * ZyDAS vendor driver. Unlike other RF's, Ubec publish full technical specs
+ * for this RF on their website, so we're able to understand more than
+ * usual as to what is going on. Thumbs up for Ubec for doing that. */
+
+/* The 3-wire serial interface provides access to 8 write-only registers.
+ * The data format is a 4 bit register address followed by a 20 bit value. */
+#define UW2453_REGWRITE(reg, val) ((((reg) & 0xf) << 20) | ((val) & 0xfffff))
+
+/* For channel tuning, we have to configure registers 1 (synthesizer), 2 (synth
+ * fractional divide ratio) and 3 (VCO config).
+ *
+ * We configure the RF to produce an interrupt when the PLL is locked onto
+ * the configured frequency. During initialization, we run through a variety
+ * of different VCO configurations on channel 1 until we detect a PLL lock.
+ * When this happens, we remember which VCO configuration produced the lock
+ * and use it later. Actually, we use the configuration *after* the one that
+ * produced the lock, which seems odd, but it works.
+ *
+ * If we do not see a PLL lock on any standard VCO config, we fall back on an
+ * autocal configuration, which has a fixed (as opposed to per-channel) VCO
+ * config and different synth values from the standard set (divide ratio
+ * is still shared with the standard set). */
+
+/* The per-channel synth values for all standard VCO configurations. These get
+ * written to register 1. */
+static const u8 uw2453_std_synth[] = {
+        RF_CHANNEL( 1) = 0x47,
+        RF_CHANNEL( 2) = 0x47,
+        RF_CHANNEL( 3) = 0x67,
+        RF_CHANNEL( 4) = 0x67,
+        RF_CHANNEL( 5) = 0x67,
+        RF_CHANNEL( 6) = 0x67,
+        RF_CHANNEL( 7) = 0x57,
+        RF_CHANNEL( 8) = 0x57,
+        RF_CHANNEL( 9) = 0x57,
+        RF_CHANNEL(10) = 0x57,
+        RF_CHANNEL(11) = 0x77,
+        RF_CHANNEL(12) = 0x77,
+        RF_CHANNEL(13) = 0x77,
+        RF_CHANNEL(14) = 0x4f,
+};
+
+/* This table stores the synthesizer fractional divide ratio for *all* VCO
+ * configurations (both standard and autocal). These get written to register 2.
+ */
+static const u16 uw2453_synth_divide[] = {
+        RF_CHANNEL( 1) = 0x999,
+        RF_CHANNEL( 2) = 0x99b,
+        RF_CHANNEL( 3) = 0x998,
+        RF_CHANNEL( 4) = 0x99a,
+        RF_CHANNEL( 5) = 0x999,
+        RF_CHANNEL( 6) = 0x99b,
+        RF_CHANNEL( 7) = 0x998,
+        RF_CHANNEL( 8) = 0x99a,
+        RF_CHANNEL( 9) = 0x999,
+        RF_CHANNEL(10) = 0x99b,
+        RF_CHANNEL(11) = 0x998,
+        RF_CHANNEL(12) = 0x99a,
+        RF_CHANNEL(13) = 0x999,
+        RF_CHANNEL(14) = 0xccc,
+};
+
+/* Here is the data for all the standard VCO configurations. We shrink our
+ * table a little by observing that both channels in a consecutive pair share
+ * the same value. We also observe that the high 4 bits ([0:3] in the specs)
+ * are all 'Reserved' and are always set to 0x4 - we chop them off in the data
+ * below. */
+#define CHAN_TO_PAIRIDX(a) ((a - 1) / 2)
+#define RF_CHANPAIR(a,b) [CHAN_TO_PAIRIDX(a)]
+static const u16 uw2453_std_vco_cfg[][7] = {
+        { /* table 1 */
+                RF_CHANPAIR( 1,  2) = 0x664d,
+                RF_CHANPAIR( 3,  4) = 0x604d,
+                RF_CHANPAIR( 5,  6) = 0x6675,
+                RF_CHANPAIR( 7,  8) = 0x6475,
+                RF_CHANPAIR( 9, 10) = 0x6655,
+                RF_CHANPAIR(11, 12) = 0x6455,
+                RF_CHANPAIR(13, 14) = 0x6665,
+        },
+        { /* table 2 */
+                RF_CHANPAIR( 1,  2) = 0x666d,
+                RF_CHANPAIR( 3,  4) = 0x606d,
+                RF_CHANPAIR( 5,  6) = 0x664d,
+                RF_CHANPAIR( 7,  8) = 0x644d,
+                RF_CHANPAIR( 9, 10) = 0x6675,
+                RF_CHANPAIR(11, 12) = 0x6475,
+                RF_CHANPAIR(13, 14) = 0x6655,
+        },
+        { /* table 3 */
+                RF_CHANPAIR( 1,  2) = 0x665d,
+                RF_CHANPAIR( 3,  4) = 0x605d,
+                RF_CHANPAIR( 5,  6) = 0x666d,
+                RF_CHANPAIR( 7,  8) = 0x646d,
+                RF_CHANPAIR( 9, 10) = 0x664d,
+                RF_CHANPAIR(11, 12) = 0x644d,
+                RF_CHANPAIR(13, 14) = 0x6675,
+        },
+        { /* table 4 */
+                RF_CHANPAIR( 1,  2) = 0x667d,
+                RF_CHANPAIR( 3,  4) = 0x607d,
+                RF_CHANPAIR( 5,  6) = 0x665d,
+                RF_CHANPAIR( 7,  8) = 0x645d,
+                RF_CHANPAIR( 9, 10) = 0x666d,
+                RF_CHANPAIR(11, 12) = 0x646d,
+                RF_CHANPAIR(13, 14) = 0x664d,
+        },
+        { /* table 5 */
+                RF_CHANPAIR( 1,  2) = 0x6643,
+                RF_CHANPAIR( 3,  4) = 0x6043,
+                RF_CHANPAIR( 5,  6) = 0x667d,
+                RF_CHANPAIR( 7,  8) = 0x647d,
+                RF_CHANPAIR( 9, 10) = 0x665d,
+                RF_CHANPAIR(11, 12) = 0x645d,
+                RF_CHANPAIR(13, 14) = 0x666d,
+        },
+        { /* table 6 */
+                RF_CHANPAIR( 1,  2) = 0x6663,
+                RF_CHANPAIR( 3,  4) = 0x6063,
+                RF_CHANPAIR( 5,  6) = 0x6643,
+                RF_CHANPAIR( 7,  8) = 0x6443,
+                RF_CHANPAIR( 9, 10) = 0x667d,
+                RF_CHANPAIR(11, 12) = 0x647d,
+                RF_CHANPAIR(13, 14) = 0x665d,
+        },
+        { /* table 7 */
+                RF_CHANPAIR( 1,  2) = 0x6653,
+                RF_CHANPAIR( 3,  4) = 0x6053,
+                RF_CHANPAIR( 5,  6) = 0x6663,
+                RF_CHANPAIR( 7,  8) = 0x6463,
+                RF_CHANPAIR( 9, 10) = 0x6643,
+                RF_CHANPAIR(11, 12) = 0x6443,
+                RF_CHANPAIR(13, 14) = 0x667d,
+        },
+        { /* table 8 */
+                RF_CHANPAIR( 1,  2) = 0x6673,
+                RF_CHANPAIR( 3,  4) = 0x6073,
+                RF_CHANPAIR( 5,  6) = 0x6653,
+                RF_CHANPAIR( 7,  8) = 0x6453,
+                RF_CHANPAIR( 9, 10) = 0x6663,
+                RF_CHANPAIR(11, 12) = 0x6463,
+                RF_CHANPAIR(13, 14) = 0x6643,
+        },
+        { /* table 9 */
+                RF_CHANPAIR( 1,  2) = 0x664b,
+                RF_CHANPAIR( 3,  4) = 0x604b,
+                RF_CHANPAIR( 5,  6) = 0x6673,
+                RF_CHANPAIR( 7,  8) = 0x6473,
+                RF_CHANPAIR( 9, 10) = 0x6653,
+                RF_CHANPAIR(11, 12) = 0x6453,
+                RF_CHANPAIR(13, 14) = 0x6663,
+        },
+        { /* table 10 */
+                RF_CHANPAIR( 1,  2) = 0x666b,
+                RF_CHANPAIR( 3,  4) = 0x606b,
+                RF_CHANPAIR( 5,  6) = 0x664b,
+                RF_CHANPAIR( 7,  8) = 0x644b,
+                RF_CHANPAIR( 9, 10) = 0x6673,
+                RF_CHANPAIR(11, 12) = 0x6473,
+                RF_CHANPAIR(13, 14) = 0x6653,
+        },
+        { /* table 11 */
+                RF_CHANPAIR( 1,  2) = 0x665b,
+                RF_CHANPAIR( 3,  4) = 0x605b,
+                RF_CHANPAIR( 5,  6) = 0x666b,
+                RF_CHANPAIR( 7,  8) = 0x646b,
+                RF_CHANPAIR( 9, 10) = 0x664b,
+                RF_CHANPAIR(11, 12) = 0x644b,
+                RF_CHANPAIR(13, 14) = 0x6673,
+        },
+
+};
+
+/* The per-channel synth values for autocal. These get written to register 1. */
+static const u16 uw2453_autocal_synth[] = {
+        RF_CHANNEL( 1) = 0x6847,
+        RF_CHANNEL( 2) = 0x6847,
+        RF_CHANNEL( 3) = 0x6867,
+        RF_CHANNEL( 4) = 0x6867,
+        RF_CHANNEL( 5) = 0x6867,
+        RF_CHANNEL( 6) = 0x6867,
+        RF_CHANNEL( 7) = 0x6857,
+        RF_CHANNEL( 8) = 0x6857,
+        RF_CHANNEL( 9) = 0x6857,
+        RF_CHANNEL(10) = 0x6857,
+        RF_CHANNEL(11) = 0x6877,
+        RF_CHANNEL(12) = 0x6877,
+        RF_CHANNEL(13) = 0x6877,
+        RF_CHANNEL(14) = 0x684f,
+};
+
+/* The VCO configuration for autocal (all channels) */
+static const u16 UW2453_AUTOCAL_VCO_CFG = 0x6662;
+
+/* TX gain settings. The array index corresponds to the TX power integration
+ * values found in the EEPROM. The values get written to register 7. */
+static u32 uw2453_txgain[] = {
+        [0x00] = 0x0e313,
+        [0x01] = 0x0fb13,
+        [0x02] = 0x0e093,
+        [0x03] = 0x0f893,
+        [0x04] = 0x0ea93,
+        [0x05] = 0x1f093,
+        [0x06] = 0x1f493,
+        [0x07] = 0x1f693,
+        [0x08] = 0x1f393,
+        [0x09] = 0x1f35b,
+        [0x0a] = 0x1e6db,
+        [0x0b] = 0x1ff3f,
+        [0x0c] = 0x1ffff,
+        [0x0d] = 0x361d7,
+        [0x0e] = 0x37fbf,
+        [0x0f] = 0x3ff8b,
+        [0x10] = 0x3ff33,
+        [0x11] = 0x3fb3f,
+        [0x12] = 0x3ffff,
+};
+
+/* RF-specific structure */
+struct uw2453_priv {
+        /* index into synth/VCO config tables where PLL lock was found
+         * -1 means autocal */
+        int config;
+};
+
+#define UW2453_PRIV(rf) ((struct uw2453_priv *) (rf)->priv)
+
+static int uw2453_synth_set_channel(struct zd_chip *chip, int channel,
+        bool autocal)
+{
+        int r;
+        int idx = channel - 1;
+        u32 val;
+
+        if (autocal)
+                val = UW2453_REGWRITE(1, uw2453_autocal_synth[idx]);
+        else
+                val = UW2453_REGWRITE(1, uw2453_std_synth[idx]);
+
+        r = zd_rfwrite_locked(chip, val, RF_RV_BITS);
+        if (r)
+                return r;
+
+        return zd_rfwrite_locked(chip,
+                UW2453_REGWRITE(2, uw2453_synth_divide[idx]), RF_RV_BITS);
+}
+
+static int uw2453_write_vco_cfg(struct zd_chip *chip, u16 value)
+{
+        /* vendor driver always sets these upper bits even though the specs say
+         * they are reserved */
+        u32 val = 0x40000 | value;
+        return zd_rfwrite_locked(chip, UW2453_REGWRITE(3, val), RF_RV_BITS);
+}
+
+static int uw2453_init_mode(struct zd_chip *chip)
+{
+        static const u32 rv[] = {
+                UW2453_REGWRITE(0, 0x25f98), /* enter IDLE mode */
+                UW2453_REGWRITE(0, 0x25f9a), /* enter CAL_VCO mode */
+                UW2453_REGWRITE(0, 0x25f94), /* enter RX/TX mode */
+                UW2453_REGWRITE(0, 0x27fd4), /* power down RSSI circuit */
+        };
+
+        return zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);
+}
+
+static int uw2453_set_tx_gain_level(struct zd_chip *chip, int channel)
+{
+        u8 int_value = chip->pwr_int_values[channel - 1];
+
+        if (int_value >= ARRAY_SIZE(uw2453_txgain)) {
+                dev_dbg_f(zd_chip_dev(chip), "can't configure TX gain for "
+                          "int value %x on channel %d\n", int_value, channel);
+                return 0;
+        }
+
+        return zd_rfwrite_locked(chip,
+                UW2453_REGWRITE(7, uw2453_txgain[int_value]), RF_RV_BITS);
+}
+
+static int uw2453_init_hw(struct zd_rf *rf)
+{
+        int i, r;
+        int found_config = -1;
+        u16 intr_status;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR10,  0x89 }, { CR15,  0x20 },
+                { CR17,  0x28 }, /* 6112 no change */
+                { CR23,  0x38 }, { CR24,  0x20 }, { CR26,  0x93 },
+                { CR27,  0x15 }, { CR28,  0x3e }, { CR29,  0x00 },
+                { CR33,  0x28 }, { CR34,  0x30 },
+                { CR35,  0x43 }, /* 6112 3e->43 */
+                { CR41,  0x24 }, { CR44,  0x32 },
+                { CR46,  0x92 }, /* 6112 96->92 */
+                { CR47,  0x1e },
+                { CR48,  0x04 }, /* 5602 Roger */
+                { CR49,  0xfa }, { CR79,  0x58 }, { CR80,  0x30 },
+                { CR81,  0x30 }, { CR87,  0x0a }, { CR89,  0x04 },
+                { CR91,  0x00 }, { CR92,  0x0a }, { CR98,  0x8d },
+                { CR99,  0x28 }, { CR100, 0x02 },
+                { CR101, 0x09 }, /* 6112 13->1f 6220 1f->13 6407 13->9 */
+                { CR102, 0x27 },
+                { CR106, 0x1c }, /* 5d07 5112 1f->1c 6220 1c->1f 6221 1f->1c */
+                { CR107, 0x1c }, /* 6220 1c->1a 5221 1a->1c */
+                { CR109, 0x13 },
+                { CR110, 0x1f }, /* 6112 13->1f 6221 1f->13 6407 13->0x09 */
+                { CR111, 0x13 }, { CR112, 0x1f }, { CR113, 0x27 },
+                { CR114, 0x23 }, /* 6221 27->23 */
+                { CR115, 0x24 }, /* 6112 24->1c 6220 1c->24 */
+                { CR116, 0x24 }, /* 6220 1c->24 */
+                { CR117, 0xfa }, /* 6112 fa->f8 6220 f8->f4 6220 f4->fa */
+                { CR118, 0xf0 }, /* 5d07 6112 f0->f2 6220 f2->f0 */
+                { CR119, 0x1a }, /* 6112 1a->10 6220 10->14 6220 14->1a */
+                { CR120, 0x4f },
+                { CR121, 0x1f }, /* 6220 4f->1f */
+                { CR122, 0xf0 }, { CR123, 0x57 }, { CR125, 0xad },
+                { CR126, 0x6c }, { CR127, 0x03 },
+                { CR128, 0x14 }, /* 6302 12->11 */
+                { CR129, 0x12 }, /* 6301 10->0f */
+                { CR130, 0x10 }, { CR137, 0x50 }, { CR138, 0xa8 },
+                { CR144, 0xac }, { CR146, 0x20 }, { CR252, 0xff },
+                { CR253, 0xff },
+        };
+
+        static const u32 rv[] = {
+                UW2453_REGWRITE(4, 0x2b),    /* configure reciever gain */
+                UW2453_REGWRITE(5, 0x19e4f), /* configure transmitter gain */
+                UW2453_REGWRITE(6, 0xf81ad), /* enable RX/TX filter tuning */
+                UW2453_REGWRITE(7, 0x3fffe), /* disable TX gain in test mode */
+
+                /* enter CAL_FIL mode, TX gain set by registers, RX gain set by pins,
+                 * RSSI circuit powered down, reduced RSSI range */
+                UW2453_REGWRITE(0, 0x25f9c), /* 5d01 cal_fil */
+
+                /* synthesizer configuration for channel 1 */
+                UW2453_REGWRITE(1, 0x47),
+                UW2453_REGWRITE(2, 0x999),
+
+                /* disable manual VCO band selection */
+                UW2453_REGWRITE(3, 0x7602),
+
+                /* enable manual VCO band selection, configure current level */
+                UW2453_REGWRITE(3, 0x46063),
+        };
+
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                return r;
+
+        r = zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);
+        if (r)
+                return r;
+
+        r = uw2453_init_mode(chip);
+        if (r)
+                return r;
+
+        /* Try all standard VCO configuration settings on channel 1 */
+        for (i = 0; i < ARRAY_SIZE(uw2453_std_vco_cfg) - 1; i++) {
+                /* Configure synthesizer for channel 1 */
+                r = uw2453_synth_set_channel(chip, 1, false);
+                if (r)
+                        return r;
+
+                /* Write VCO config */
+                r = uw2453_write_vco_cfg(chip, uw2453_std_vco_cfg[i][0]);
+                if (r)
+                        return r;
+
+                /* ack interrupt event */
+                r = zd_iowrite16_locked(chip, 0x0f, UW2453_INTR_REG);
+                if (r)
+                        return r;
+
+                /* check interrupt status */
+                r = zd_ioread16_locked(chip, &intr_status, UW2453_INTR_REG);
+                if (r)
+                        return r;
+
+                if (!intr_status & 0xf) {
+                        dev_dbg_f(zd_chip_dev(chip),
+                                "PLL locked on configuration %d\n", i);
+                        found_config = i;
+                        break;
+                }
+        }
+
+        if (found_config == -1) {
+                /* autocal */
+                dev_dbg_f(zd_chip_dev(chip),
+                        "PLL did not lock, using autocal\n");
+
+                r = uw2453_synth_set_channel(chip, 1, true);
+                if (r)
+                        return r;
+
+                r = uw2453_write_vco_cfg(chip, UW2453_AUTOCAL_VCO_CFG);
+                if (r)
+                        return r;
+        }
+
+        /* To match the vendor driver behaviour, we use the configuration after
+         * the one that produced a lock. */
+        UW2453_PRIV(rf)->config = found_config + 1;
+
+        return zd_iowrite16_locked(chip, 0x06, CR203);
+}
+
+static int uw2453_set_channel(struct zd_rf *rf, u8 channel)
+{
+        int r;
+        u16 vco_cfg;
+        int config = UW2453_PRIV(rf)->config;
+        bool autocal = (config == -1);
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR80,  0x30 }, { CR81,  0x30 }, { CR79,  0x58 },
+                { CR12,  0xf0 }, { CR77,  0x1b }, { CR78,  0x58 },
+        };
+
+        r = uw2453_synth_set_channel(chip, channel, autocal);
+        if (r)
+                return r;
+
+        if (autocal)
+                vco_cfg = UW2453_AUTOCAL_VCO_CFG;
+        else
+                vco_cfg = uw2453_std_vco_cfg[config][CHAN_TO_PAIRIDX(channel)];
+
+        r = uw2453_write_vco_cfg(chip, vco_cfg);
+        if (r)
+                return r;
+
+        r = uw2453_init_mode(chip);
+        if (r)
+                return r;
+
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                return r;
+
+        r = uw2453_set_tx_gain_level(chip, channel);
+        if (r)
+                return r;
+
+        return zd_iowrite16_locked(chip, 0x06, CR203);
+}
+
+static int uw2453_switch_radio_on(struct zd_rf *rf)
+{
+        int r;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        struct zd_ioreq16 ioreqs[] = {
+                { CR11,  0x00 }, { CR251, 0x3f },
+        };
+
+        /* enter RXTX mode */
+        r = zd_rfwrite_locked(chip, UW2453_REGWRITE(0, 0x25f94), RF_RV_BITS);
+        if (r)
+                return r;
+
+        if (chip->is_zd1211b)
+                ioreqs[1].value = 0x7f;
+
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+
+static int uw2453_switch_radio_off(struct zd_rf *rf)
+{
+        int r;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR11,  0x04 }, { CR251, 0x2f },
+        };
+
+        /* enter IDLE mode */
+        /* FIXME: shouldn't we go to SLEEP? sent email to zydas */
+        r = zd_rfwrite_locked(chip, UW2453_REGWRITE(0, 0x25f90), RF_RV_BITS);
+        if (r)
+                return r;
+
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+
+static void uw2453_clear(struct zd_rf *rf)
+{
+        kfree(rf->priv);
+}
+
+int zd_rf_init_uw2453(struct zd_rf *rf)
+{
+        rf->init_hw = uw2453_init_hw;
+        rf->set_channel = uw2453_set_channel;
+        rf->switch_radio_on = uw2453_switch_radio_on;
+        rf->switch_radio_off = uw2453_switch_radio_off;
+        rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
+        rf->clear = uw2453_clear;
+        /* we have our own TX integration code */
+        rf->update_channel_int = 0;
+
+        rf->priv = kmalloc(sizeof(struct uw2453_priv), GFP_KERNEL);
+        if (rf->priv == NULL)
+                return -ENOMEM;
+
+        return 0;
+}
+
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 8459549d0cee..740a2194fdde 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -54,6 +54,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
         /* ZD1211B */
         { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 6b76babc7fbf..a0ea43598515 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -842,12 +842,16 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
+        PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
+        PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),
+        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),
+        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),
         PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
         PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0101, 0x0562),
         PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0104, 0x0070),