Commit fe5b9907 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sunhme-cleanups' 



Sean Anderson says:

====================
net: sunhme: Probe/IRQ cleanups

Well, I've had these patches kicking around in my tree since last
October, so I guess I had better get around to posting them. This
series is mainly a cleanup/consolidation of the probe process, with
some interrupt changes as well.  Some of these changes are SBUS- (AKA
SPARC-) specific, so this should really get some testing there as well
to ensure nothing breaks. I've CC'd a few SPARC mailing lists in hopes
that someone there can try this out. I also have an SBUS card I
ordered by mistake if anyone has a SPARC computer but lacks this card.

Changes in v4:
- Tweak variable order for yuletide
- Move uninitialized return to its own commit
- Use correct SBUS/PCI accessors
- Rework hme_version to set the default in pci/sbus_probe and override it (if
  necessary) in common_probe

Changes in v3:
- Incorperate a fix from another series into this commit

Changes in v2:
- Move happy_meal_begin_auto_negotiation earlier and remove forward declaration
- Make some more includes common
- Clean up mac address init
- Inline error returns
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6595d358 ecdcd042

drivers/net/ethernet/sun/sunhme.c

+436 −759

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sun/sunhme.h

+2 −4
Original line number Diff line number Diff line
@@ -462,22 +462,20 @@ struct happy_meal { 
};



/* Here are the happy flags. */

#define HFLAG_POLL                0x00000001      /* We are doing MIF polling          */

#define HFLAG_FENABLE             0x00000002      /* The MII frame is enabled          */

#define HFLAG_LANCE               0x00000004      /* We are using lance-mode           */

#define HFLAG_RXENABLE            0x00000008      /* Receiver is enabled               */

#define HFLAG_AUTO                0x00000010      /* Using auto-negotiation, 0 = force */

#define HFLAG_FULL                0x00000020      /* Full duplex enable                */

#define HFLAG_MACFULL             0x00000040      /* Using full duplex in the MAC      */

#define HFLAG_POLLENABLE          0x00000080      /* Actually try MIF polling          */

#define HFLAG_RXCV                0x00000100      /* XXX RXCV ENABLE                   */

#define HFLAG_INIT                0x00000200      /* Init called at least once         */

#define HFLAG_LINKUP              0x00000400      /* 1 = Link is up                    */

#define HFLAG_PCI                 0x00000800      /* PCI based Happy Meal              */

#define HFLAG_QUATTRO		  0x00001000      /* On QFE/Quattro card	       */



#define HFLAG_20_21  (HFLAG_POLLENABLE | HFLAG_FENABLE)

#define HFLAG_NOT_A0 (HFLAG_POLLENABLE | HFLAG_FENABLE | HFLAG_LANCE | HFLAG_RXCV)

#define HFLAG_20_21  HFLAG_FENABLE

#define HFLAG_NOT_A0 (HFLAG_FENABLE | HFLAG_LANCE | HFLAG_RXCV)



/* Support for QFE/Quattro cards. */

struct quattro {