[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/FC-6 git-wireless-dev.patch, 1.1, 1.2 kernel-2.6.spec, 1.3009, 1.3010



Author: linville

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14614

Modified Files:
	git-wireless-dev.patch kernel-2.6.spec 
Log Message:
remove b44 bits from git-wireless-dev.patch (broken and unnecessary)

git-wireless-dev.patch:
 .mailmap                                                |    1 
 CREDITS                                                 |   31 
 MAINTAINERS                                             |   55 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/misc/Kconfig                                    |    5 
 drivers/misc/Makefile                                   |    1 
 drivers/misc/eeprom_93cx6.c                             |  347 
 drivers/net/wireless/Kconfig                            |    2 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    1 
 drivers/net/wireless/mac80211/Kconfig                   |    7 
 drivers/net/wireless/mac80211/Makefile                  |    7 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2165 ++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  620 +
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  101 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  885 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1383 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1111 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 4022 +++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4322 ++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  603 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 drivers/net/wireless/mac80211/iwlwifi/Kconfig           |   96 
 drivers/net/wireless/mac80211/iwlwifi/Makefile          |   29 
 drivers/net/wireless/mac80211/iwlwifi/base.c            | 8375 ++++++++++++++++
 drivers/net/wireless/mac80211/iwlwifi/iwl-3945-hw.h     |   90 
 drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c     |  969 +
 drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h     |  221 
 drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c        | 2445 ++++
 drivers/net/wireless/mac80211/iwlwifi/iwl-3945.h        |   52 
 drivers/net/wireless/mac80211/iwlwifi/iwl-4965-hw.h     |  979 +
 drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c     | 2013 +++
 drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.h     |  285 
 drivers/net/wireless/mac80211/iwlwifi/iwl-4965.c        | 4379 ++++++++
 drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h        |  247 
 drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h     |  161 
 drivers/net/wireless/mac80211/iwlwifi/iwl-commands.h    |  701 +
 drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h       |  140 
 drivers/net/wireless/mac80211/iwlwifi/iwl-eeprom.h      |  335 
 drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h     |  363 
 drivers/net/wireless/mac80211/iwlwifi/iwl-hw.h          | 1507 ++
 drivers/net/wireless/mac80211/iwlwifi/iwl-io.h          |  474 
 drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h        |  303 
 drivers/net/wireless/mac80211/iwlwifi/iwl-spectrum.h    |   91 
 drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h         |  658 +
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 
 drivers/net/wireless/mac80211/p54/prism54.h             |   79 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  954 +
 drivers/net/wireless/mac80211/p54/prism54common.h       |  329 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  688 +
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  898 +
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |  130 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |   22 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 1802 +++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  931 +
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2029 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1198 ++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 1837 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  733 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1085 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  360 
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   66 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  764 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.c   |  130 
 drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.h   |   49 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |  119 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  433 
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c        |  598 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   83 
 drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.c     |  133 
 drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.h     |   51 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c        |  620 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |  120 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 2443 ++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1345 ++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 2049 +++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  934 +
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  131 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  731 +
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  744 +
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  212 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1684 +++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  913 +
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  942 +
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  199 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  177 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |  108 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  437 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  492 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_uw2453.c   |  534 +
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1445 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  267 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    1 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1054 ++
 drivers/ssb/pci.c                                       |  672 +
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |   21 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  231 
 include/linux/nl80211.h                                 |  263 
 include/linux/ssb/ssb.h                                 |  403 
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  117 
 include/net/iw_handler.h                                |    8 
 include/net/mac80211.h                                  |   25 
 net/mac80211/Kconfig                                    |    4 
 net/mac80211/Makefile                                   |    3 
 net/mac80211/debugfs.c                                  |   61 
 net/mac80211/debugfs_netdev.c                           |  345 
 net/mac80211/debugfs_sta.c                              |    5 
 net/mac80211/hostapd_ioctl.h                            |  236 
 net/mac80211/ieee80211.c                                |  157 
 net/mac80211/ieee80211_cfg.c                            |    8 
 net/mac80211/ieee80211_i.h                              |  112 
 net/mac80211/ieee80211_iface.c                          |   17 
 net/mac80211/ieee80211_ioctl.c                          | 1620 ++-
 net/mac80211/ieee80211_sta.c                            |  951 +
 net/mac80211/rc80211_lowest.c                           |  105 
 net/mac80211/rc80211_simple.c                           |   12 
 net/mac80211/regdomain.c                                |  157 
 net/mac80211/sta_info.c                                 |   34 
 net/mac80211/sta_info.h                                 |   15 
 net/mac80211/wme.c                                      |   48 
 net/mac80211/wpa.c                                      |  190 
 net/wireless/Kconfig                                    |   17 
 net/wireless/Makefile                                   |    1 
 net/wireless/core.c                                     |  143 
 net/wireless/core.h                                     |   32 
 net/wireless/nl80211.c                                  |  994 +
 net/wireless/nl80211.h                                  |   24 
 net/wireless/sysfs.c                                    |   50 
 182 files changed, 89282 insertions(+), 248 deletions(-)

Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/git-wireless-dev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-wireless-dev.patch	10 Jul 2007 01:23:51 -0000	1.1
+++ git-wireless-dev.patch	15 Aug 2007 15:22:32 -0000	1.2
@@ -9618,1493 +9618,6 @@
 +	  The driver supports both read as well as write commands.
  
  endmenu
---- linux-2.6.21.noarch/drivers/net/b44.h.orig	2007-04-25 23:08:32.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/b44.h	2007-06-25 09:55:35.000000000 -0400
-@@ -129,6 +129,7 @@
- #define  RXCONFIG_FLOW		0x00000020 /* Flow Control Enable */
- #define  RXCONFIG_FLOW_ACCEPT	0x00000040 /* Accept Unicast Flow Control Frame */
- #define  RXCONFIG_RFILT		0x00000080 /* Reject Filter */
-+#define  RXCONFIG_CAM_ABSENT	0x00000100 /* CAM Absent */
- #define B44_RXMAXLEN	0x0404UL /* EMAC RX Max Packet Length */
- #define B44_TXMAXLEN	0x0408UL /* EMAC TX Max Packet Length */
- #define B44_MDIO_CTRL	0x0410UL /* EMAC MDIO Control */
-@@ -227,76 +228,6 @@
- #define B44_RX_PAUSE	0x05D4UL /* MIB RX Pause Packets */
- #define B44_RX_NPAUSE	0x05D8UL /* MIB RX Non-Pause Packets */
- 
--/* Silicon backplane register definitions */
--#define B44_SBIMSTATE	0x0F90UL /* SB Initiator Agent State */
--#define  SBIMSTATE_PC		0x0000000f /* Pipe Count */
--#define  SBIMSTATE_AP_MASK	0x00000030 /* Arbitration Priority */
--#define  SBIMSTATE_AP_BOTH	0x00000000 /* Use both timeslices and token */
--#define  SBIMSTATE_AP_TS	0x00000010 /* Use timeslices only */
--#define  SBIMSTATE_AP_TK	0x00000020 /* Use token only */
--#define  SBIMSTATE_AP_RSV	0x00000030 /* Reserved */
--#define  SBIMSTATE_IBE		0x00020000 /* In Band Error */
--#define  SBIMSTATE_TO		0x00040000 /* Timeout */
--#define B44_SBINTVEC	0x0F94UL /* SB Interrupt Mask */
--#define  SBINTVEC_PCI		0x00000001 /* Enable interrupts for PCI */
--#define  SBINTVEC_ENET0		0x00000002 /* Enable interrupts for enet 0 */
--#define  SBINTVEC_ILINE20	0x00000004 /* Enable interrupts for iline20 */
--#define  SBINTVEC_CODEC		0x00000008 /* Enable interrupts for v90 codec */
--#define  SBINTVEC_USB		0x00000010 /* Enable interrupts for usb */
--#define  SBINTVEC_EXTIF		0x00000020 /* Enable interrupts for external i/f */
--#define  SBINTVEC_ENET1		0x00000040 /* Enable interrupts for enet 1 */
--#define B44_SBTMSLOW	0x0F98UL /* SB Target State Low */
--#define  SBTMSLOW_RESET		0x00000001 /* Reset */
--#define  SBTMSLOW_REJECT	0x00000002 /* Reject */
--#define  SBTMSLOW_CLOCK		0x00010000 /* Clock Enable */
--#define  SBTMSLOW_FGC		0x00020000 /* Force Gated Clocks On */
--#define  SBTMSLOW_PE		0x40000000 /* Power Management Enable */
--#define  SBTMSLOW_BE		0x80000000 /* BIST Enable */
--#define B44_SBTMSHIGH	0x0F9CUL /* SB Target State High */
--#define  SBTMSHIGH_SERR		0x00000001 /* S-error */
--#define  SBTMSHIGH_INT		0x00000002 /* Interrupt */
--#define  SBTMSHIGH_BUSY		0x00000004 /* Busy */
--#define  SBTMSHIGH_GCR		0x20000000 /* Gated Clock Request */
--#define  SBTMSHIGH_BISTF	0x40000000 /* BIST Failed */
--#define  SBTMSHIGH_BISTD	0x80000000 /* BIST Done */
--#define B44_SBIDHIGH	0x0FFCUL /* SB Identification High */
--#define  SBIDHIGH_RC_MASK	0x0000000f /* Revision Code */
--#define  SBIDHIGH_CC_MASK	0x0000fff0 /* Core Code */
--#define  SBIDHIGH_CC_SHIFT	4
--#define  SBIDHIGH_VC_MASK	0xffff0000 /* Vendor Code */
--#define  SBIDHIGH_VC_SHIFT	16
--
--/* SSB PCI config space registers.  */
--#define SSB_PMCSR		0x44
--#define  SSB_PE			0x100
--#define	SSB_BAR0_WIN		0x80
--#define	SSB_BAR1_WIN		0x84
--#define	SSB_SPROM_CONTROL	0x88
--#define	SSB_BAR1_CONTROL	0x8c
--
--/* SSB core and host control registers.  */
--#define SSB_CONTROL		0x0000UL
--#define SSB_ARBCONTROL		0x0010UL
--#define SSB_ISTAT		0x0020UL
--#define SSB_IMASK		0x0024UL
--#define SSB_MBOX		0x0028UL
--#define SSB_BCAST_ADDR		0x0050UL
--#define SSB_BCAST_DATA		0x0054UL
--#define SSB_PCI_TRANS_0		0x0100UL
--#define SSB_PCI_TRANS_1		0x0104UL
--#define SSB_PCI_TRANS_2		0x0108UL
--#define SSB_SPROM		0x0800UL
--
--#define SSB_PCI_MEM		0x00000000
--#define SSB_PCI_IO		0x00000001
--#define SSB_PCI_CFG0		0x00000002
--#define SSB_PCI_CFG1		0x00000003
--#define SSB_PCI_PREF		0x00000004
--#define SSB_PCI_BURST		0x00000008
--#define SSB_PCI_MASK0		0xfc000000
--#define SSB_PCI_MASK1		0xfc000000
--#define SSB_PCI_MASK2		0xc0000000
--
- /* 4400 PHY registers */
- #define B44_MII_AUXCTRL		24	/* Auxiliary Control */
- #define  MII_AUXCTRL_DUPLEX	0x0001  /* Full Duplex */
-@@ -346,10 +277,12 @@ struct rx_header {
- 
- struct ring_info {
- 	struct sk_buff		*skb;
--	DECLARE_PCI_UNMAP_ADDR(mapping);
-+	dma_addr_t	mapping;
- };
- 
- #define B44_MCAST_TABLE_SIZE	32
-+#define B44_PHY_ADDR_NO_PHY	30
-+#define B44_MDC_RATIO		5000000
- 
- #define	B44_STAT_REG_DECLARE		\
- 	_B44(tx_good_octets)		\
-@@ -410,6 +343,8 @@ B44_STAT_REG_DECLARE
- #undef _B44
- };
- 
-+struct ssb_device;
-+
- struct b44 {
- 	spinlock_t		lock;
- 
-@@ -452,8 +387,7 @@ struct b44 {
- 	struct net_device_stats	stats;
- 	struct b44_hw_stats	hw_stats;
- 
--	void __iomem		*regs;
--	struct pci_dev		*pdev;
-+	struct ssb_device	*sdev;
- 	struct net_device	*dev;
- 
- 	dma_addr_t		rx_ring_dma, tx_ring_dma;
-@@ -461,7 +395,6 @@ struct b44 {
- 	u32			rx_pending;
- 	u32			tx_pending;
- 	u8			phy_addr;
--	u8			core_unit;
- 
- 	struct mii_if_info	mii_if;
- };
---- linux-2.6.21.noarch/drivers/net/b44.c.orig	2007-06-25 09:16:43.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/b44.c	2007-06-25 09:55:35.000000000 -0400
-@@ -1,8 +1,11 @@
--/* b44.c: Broadcom 4400 device driver.
-+/* b44.c: Broadcom 44xx/47xx Fast Ethernet device driver.
-  *
-  * Copyright (C) 2002 David S. Miller (davem redhat com)
-- * Fixed by Pekka Pietikainen (pp ee oulu fi)
-+ * Copyright (C) 2004 Pekka Pietikainen (pp ee oulu fi)
-+ * Copyright (C) 2004 Florian Schirmer (jolt tuxbox org)
-+ * Copyright (C) 2006 Felix Fietkau (nbd openwrt org)
-  * Copyright (C) 2006 Broadcom Corporation.
-+ * Copyright (C) 2007 Michael Buesch <mb bu3sch de>
-  *
-  * Distribute under GPL.
-  */
-@@ -20,17 +23,18 @@
- #include <linux/delay.h>
- #include <linux/init.h>
- #include <linux/dma-mapping.h>
-+#include <linux/ssb/ssb.h>
- 
- #include <asm/uaccess.h>
- #include <asm/io.h>
- #include <asm/irq.h>
- 
-+
- #include "b44.h"
- 
- #define DRV_MODULE_NAME		"b44"
- #define PFX DRV_MODULE_NAME	": "
--#define DRV_MODULE_VERSION	"1.01"
--#define DRV_MODULE_RELDATE	"Jun 16, 2006"
-+#define DRV_MODULE_VERSION	"2.0"
- 
- #define B44_DEF_MSG_ENABLE	  \
- 	(NETIF_MSG_DRV		| \
-@@ -84,10 +88,10 @@
- #define B44_ETHIPV4UDP_HLEN	42
- 
- static char version[] __devinitdata =
--	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
-+	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION "\n";
- 
--MODULE_AUTHOR("Florian Schirmer, Pekka Pietikainen, David S. Miller");
--MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
-+MODULE_AUTHOR("Felix Fietkau, Florian Schirmer, Pekka Pietikainen, David S. Miller");
-+MODULE_DESCRIPTION("Broadcom 44xx/47xx 10/100 PCI ethernet driver");
- MODULE_LICENSE("GPL");
- MODULE_VERSION(DRV_MODULE_VERSION);
- 
-@@ -95,18 +99,28 @@ static int b44_debug = -1;	/* -1 == use 
- module_param(b44_debug, int, 0);
- MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
- 
--static struct pci_device_id b44_pci_tbl[] = {
--	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401,
--	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
--	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0,
--	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
--	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1,
--	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
--	{ }	/* terminate list with empty entry */
--};
- 
-+#ifdef CONFIG_B44_PCI
-+static const struct pci_device_id b44_pci_tbl[] = {
-+	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1) },
-+	{ 0 } /* terminate list with empty entry */
-+};
- MODULE_DEVICE_TABLE(pci, b44_pci_tbl);
- 
-+static struct pci_driver b44_pci_driver = {
-+	.name		= DRV_MODULE_NAME,
-+	.id_table	= b44_pci_tbl,
-+};
-+#endif /* CONFIG_B44_PCI */
-+
-+static const struct ssb_device_id b44_ssb_tbl[] = {
-+	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET, SSB_ANY_REV),
-+	SSB_DEVTABLE_END
-+};
-+MODULE_DEVICE_TABLE(ssb, b44_ssb_tbl);
-+
- static void b44_halt(struct b44 *);
- static void b44_init_rings(struct b44 *);
- 
-@@ -118,6 +132,7 @@ static void b44_init_hw(struct b44 *, in
- 
- static int dma_desc_align_mask;
- static int dma_desc_sync_size;
-+static int instance;
- 
- static const char b44_gstrings[][ETH_GSTRING_LEN] = {
- #define _B44(x...)	# x,
-@@ -125,35 +140,35 @@ B44_STAT_REG_DECLARE
- #undef _B44
- };
- 
--static inline void b44_sync_dma_desc_for_device(struct pci_dev *pdev,
--                                                dma_addr_t dma_base,
--                                                unsigned long offset,
--                                                enum dma_data_direction dir)
--{
--	dma_sync_single_range_for_device(&pdev->dev, dma_base,
--	                                 offset & dma_desc_align_mask,
--	                                 dma_desc_sync_size, dir);
--}
--
--static inline void b44_sync_dma_desc_for_cpu(struct pci_dev *pdev,
--                                             dma_addr_t dma_base,
--                                             unsigned long offset,
--                                             enum dma_data_direction dir)
--{
--	dma_sync_single_range_for_cpu(&pdev->dev, dma_base,
--	                              offset & dma_desc_align_mask,
--	                              dma_desc_sync_size, dir);
-+static inline void b44_sync_dma_desc_for_device(struct ssb_device *sdev,
-+						dma_addr_t dma_base,
-+						unsigned long offset,
-+						enum dma_data_direction dir)
-+{
-+	dma_sync_single_range_for_device(sdev->dev, dma_base,
-+					 offset & dma_desc_align_mask,
-+					 dma_desc_sync_size, dir);
-+}
-+
-+static inline void b44_sync_dma_desc_for_cpu(struct ssb_device *sdev,
-+					     dma_addr_t dma_base,
-+					     unsigned long offset,
-+					     enum dma_data_direction dir)
-+{
-+	dma_sync_single_range_for_cpu(sdev->dev, dma_base,
-+				      offset & dma_desc_align_mask,
-+				      dma_desc_sync_size, dir);
- }
- 
- static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
- {
--	return readl(bp->regs + reg);
-+	return ssb_read32(bp->sdev, reg);
- }
- 
- static inline void bw32(const struct b44 *bp,
- 			unsigned long reg, unsigned long val)
- {
--	writel(val, bp->regs + reg);
-+	ssb_write32(bp->sdev, reg, val);
- }
- 
- static int b44_wait_bit(struct b44 *bp, unsigned long reg,
-@@ -181,117 +196,29 @@ static int b44_wait_bit(struct b44 *bp, 
- 	return 0;
- }
- 
--/* Sonics SiliconBackplane support routines.  ROFL, you should see all the
-- * buzz words used on this company's website :-)
-- *
-- * All of these routines must be invoked with bp->lock held and
-- * interrupts disabled.
-- */
--
--#define SB_PCI_DMA             0x40000000      /* Client Mode PCI memory access space (1 GB) */
--#define BCM4400_PCI_CORE_ADDR  0x18002000      /* Address of PCI core on BCM4400 cards */
--
--static u32 ssb_get_core_rev(struct b44 *bp)
--{
--	return (br32(bp, B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
--}
--
--static u32 ssb_pci_setup(struct b44 *bp, u32 cores)
--{
--	u32 bar_orig, pci_rev, val;
--
--	pci_read_config_dword(bp->pdev, SSB_BAR0_WIN, &bar_orig);
--	pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, BCM4400_PCI_CORE_ADDR);
--	pci_rev = ssb_get_core_rev(bp);
--
--	val = br32(bp, B44_SBINTVEC);
--	val |= cores;
--	bw32(bp, B44_SBINTVEC, val);
--
--	val = br32(bp, SSB_PCI_TRANS_2);
--	val |= SSB_PCI_PREF | SSB_PCI_BURST;
--	bw32(bp, SSB_PCI_TRANS_2, val);
--
--	pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, bar_orig);
--
--	return pci_rev;
--}
--
--static void ssb_core_disable(struct b44 *bp)
--{
--	if (br32(bp, B44_SBTMSLOW) & SBTMSLOW_RESET)
--		return;
--
--	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
--	b44_wait_bit(bp, B44_SBTMSLOW, SBTMSLOW_REJECT, 100000, 0);
--	b44_wait_bit(bp, B44_SBTMSHIGH, SBTMSHIGH_BUSY, 100000, 1);
--	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
--			    SBTMSLOW_REJECT | SBTMSLOW_RESET));
--	br32(bp, B44_SBTMSLOW);
--	udelay(1);
--	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
--	br32(bp, B44_SBTMSLOW);
--	udelay(1);
--}
--
--static void ssb_core_reset(struct b44 *bp)
-+static inline void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)
- {
- 	u32 val;
- 
--	ssb_core_disable(bp);
--	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
--	br32(bp, B44_SBTMSLOW);
--	udelay(1);
--
--	/* Clear SERR if set, this is a hw bug workaround.  */
--	if (br32(bp, B44_SBTMSHIGH) & SBTMSHIGH_SERR)
--		bw32(bp, B44_SBTMSHIGH, 0);
--
--	val = br32(bp, B44_SBIMSTATE);
--	if (val & (SBIMSTATE_IBE | SBIMSTATE_TO))
--		bw32(bp, B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
--
--	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
--	br32(bp, B44_SBTMSLOW);
--	udelay(1);
--
--	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK));
--	br32(bp, B44_SBTMSLOW);
--	udelay(1);
--}
-+	bw32(bp, B44_CAM_CTRL, (CAM_CTRL_READ |
-+			    (index << CAM_CTRL_INDEX_SHIFT)));
- 
--static int ssb_core_unit(struct b44 *bp)
--{
--#if 0
--	u32 val = br32(bp, B44_SBADMATCH0);
--	u32 base;
-+	b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);
- 
--	type = val & SBADMATCH0_TYPE_MASK;
--	switch (type) {
--	case 0:
--		base = val & SBADMATCH0_BS0_MASK;
--		break;
-+	val = br32(bp, B44_CAM_DATA_LO);
- 
--	case 1:
--		base = val & SBADMATCH0_BS1_MASK;
--		break;
-+	data[2] = (val >> 24) & 0xFF;
-+	data[3] = (val >> 16) & 0xFF;
-+	data[4] = (val >> 8) & 0xFF;
-+	data[5] = (val >> 0) & 0xFF;
- 
--	case 2:
--	default:
--		base = val & SBADMATCH0_BS2_MASK;
--		break;
--	};
--#endif
--	return 0;
--}
-+	val = br32(bp, B44_CAM_DATA_HI);
- 
--static int ssb_is_core_up(struct b44 *bp)
--{
--	return ((br32(bp, B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
--		== SBTMSLOW_CLOCK);
-+	data[0] = (val >> 8) & 0xFF;
-+	data[1] = (val >> 0) & 0xFF;
- }
- 
--static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
-+static inline void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
- {
- 	u32 val;
- 
-@@ -327,14 +254,14 @@ static void b44_enable_ints(struct b44 *
- 	bw32(bp, B44_IMASK, bp->imask);
- }
- 
--static int b44_readphy(struct b44 *bp, int reg, u32 *val)
-+static int __b44_readphy(struct b44 *bp, int phy_addr, int reg, u32 *val)
- {
- 	int err;
- 
- 	bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
- 	bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
- 			     (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
--			     (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
-+			     (phy_addr << MDIO_DATA_PMD_SHIFT) |
- 			     (reg << MDIO_DATA_RA_SHIFT) |
- 			     (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
- 	err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
-@@ -343,18 +270,34 @@ static int b44_readphy(struct b44 *bp, i
- 	return err;
- }
- 
--static int b44_writephy(struct b44 *bp, int reg, u32 val)
-+static int __b44_writephy(struct b44 *bp, int phy_addr, int reg, u32 val)
- {
- 	bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
- 	bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
- 			     (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
--			     (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
-+			     (phy_addr << MDIO_DATA_PMD_SHIFT) |
- 			     (reg << MDIO_DATA_RA_SHIFT) |
- 			     (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT) |
- 			     (val & MDIO_DATA_DATA)));
- 	return b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
- }
- 
-+static inline int b44_readphy(struct b44 *bp, int reg, u32 *val)
-+{
-+	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
-+		return 0;
-+
-+	return __b44_readphy(bp, bp->phy_addr, reg, val);
-+}
-+
-+static inline int b44_writephy(struct b44 *bp, int reg, u32 val)
-+{
-+	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
-+		return 0;
-+
-+	return __b44_writephy(bp, bp->phy_addr, reg, val);
-+}
-+
- /* miilib interface */
- /* FIXME FIXME: phy_id is ignored, bp->phy_addr use is unconditional
-  * due to code existing before miilib use was added to this driver.
-@@ -383,6 +326,8 @@ static int b44_phy_reset(struct b44 *bp)
- 	u32 val;
- 	int err;
- 
-+	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
-+		return 0;
- 	err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
- 	if (err)
- 		return err;
-@@ -441,11 +386,52 @@ static void b44_set_flow_ctrl(struct b44
- 	__b44_set_flow_ctrl(bp, pause_enab);
- }
- 
-+#ifdef SSB_DRIVER_MIPS
-+extern char *nvram_get(char *name);
-+static void b44_wap54g10_workaround(struct b44 *bp)
-+{
-+	const char *str;
-+	u32 val;
-+	int err;
-+
-+	/*
-+	 * workaround for bad hardware design in Linksys WAP54G v1.0
-+	 * see https://dev.openwrt.org/ticket/146
-+	 * check and reset bit "isolate"
-+	 */
-+	str = nvram_get("boardnum");
-+	if (!str)
-+		return;
-+	if (simple_strtoul(str, NULL, 0) == 2) {
-+		err = __b44_readphy(bp, 0, MII_BMCR, &val);
-+		if (err)
-+			goto error;
-+		if (!(val & BMCR_ISOLATE))
-+			return;
-+		val &= ~BMCR_ISOLATE;
-+		err = __b44_writephy(bp, 0, MII_BMCR, val);
-+		if (err)
-+			goto error;
-+	}
-+	return;
-+error:
-+	printk(KERN_WARNING PFX "PHY: cannot reset MII transceiver isolate bit.\n");
-+}
-+#else
-+static inline void b44_wap54g10_workaround(struct b44 *bp)
-+{
-+}
-+#endif
-+
- static int b44_setup_phy(struct b44 *bp)
- {
- 	u32 val;
- 	int err;
- 
-+	b44_wap54g10_workaround(bp);
-+
-+	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
-+		return 0;
- 	if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
- 		goto out;
- 	if ((err = b44_writephy(bp, B44_MII_ALEDCTRL,
-@@ -541,6 +527,19 @@ static void b44_check_phy(struct b44 *bp
- {
- 	u32 bmsr, aux;
- 
-+	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
-+		bp->flags |= B44_FLAG_100_BASE_T;
-+		bp->flags |= B44_FLAG_FULL_DUPLEX;
-+		if (!netif_carrier_ok(bp->dev)) {
-+			u32 val = br32(bp, B44_TX_CTRL);
-+			val |= TX_CTRL_DUPLEX;
-+			bw32(bp, B44_TX_CTRL, val);
-+			netif_carrier_on(bp->dev);
-+			b44_link_report(bp);
-+		}
-+		return;
-+	}
-+
- 	if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
- 	    !b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
- 	    (bmsr != 0xffff)) {
-@@ -617,10 +616,10 @@ static void b44_tx(struct b44 *bp)
- 
- 		BUG_ON(skb == NULL);
- 
--		pci_unmap_single(bp->pdev,
--				 pci_unmap_addr(rp, mapping),
-+		dma_unmap_single(bp->sdev->dev,
-+				 rp->mapping,
- 				 skb->len,
--				 PCI_DMA_TODEVICE);
-+				 DMA_TO_DEVICE);
- 		rp->skb = NULL;
- 		dev_kfree_skb_irq(skb);
- 	}
-@@ -657,9 +656,9 @@ static int b44_alloc_rx_skb(struct b44 *
- 	if (skb == NULL)
- 		return -ENOMEM;
- 
--	mapping = pci_map_single(bp->pdev, skb->data,
-+	mapping = dma_map_single(bp->sdev->dev, skb->data,
- 				 RX_PKT_BUF_SZ,
--				 PCI_DMA_FROMDEVICE);
-+				 DMA_FROM_DEVICE);
- 
- 	/* Hardware bug work-around, the chip is unable to do PCI DMA
- 	   to/from anything above 1GB :-( */
-@@ -667,18 +666,19 @@ static int b44_alloc_rx_skb(struct b44 *
- 		mapping + RX_PKT_BUF_SZ > DMA_30BIT_MASK) {
- 		/* Sigh... */
- 		if (!dma_mapping_error(mapping))
--			pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
-+			dma_unmap_single(bp->sdev->dev, mapping,
-+					RX_PKT_BUF_SZ, DMA_FROM_DEVICE);
- 		dev_kfree_skb_any(skb);
- 		skb = __dev_alloc_skb(RX_PKT_BUF_SZ,GFP_DMA);
- 		if (skb == NULL)
- 			return -ENOMEM;
--		mapping = pci_map_single(bp->pdev, skb->data,
-+		mapping = dma_map_single(bp->sdev->dev, skb->data,
- 					 RX_PKT_BUF_SZ,
--					 PCI_DMA_FROMDEVICE);
-+					 DMA_FROM_DEVICE);
- 		if (dma_mapping_error(mapping) ||
- 			mapping + RX_PKT_BUF_SZ > DMA_30BIT_MASK) {
- 			if (!dma_mapping_error(mapping))
--				pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
-+				dma_unmap_single(bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
- 			dev_kfree_skb_any(skb);
- 			return -ENOMEM;
- 		}
-@@ -693,7 +693,7 @@ static int b44_alloc_rx_skb(struct b44 *
- 	rh->flags = 0;
- 
- 	map->skb = skb;
--	pci_unmap_addr_set(map, mapping, mapping);
-+	map->mapping = mapping;
- 
- 	if (src_map != NULL)
- 		src_map->skb = NULL;
-@@ -707,9 +707,9 @@ static int b44_alloc_rx_skb(struct b44 *
- 	dp->addr = cpu_to_le32((u32) mapping + bp->rx_offset + bp->dma_offset);
- 
- 	if (bp->flags & B44_FLAG_RX_RING_HACK)
--		b44_sync_dma_desc_for_device(bp->pdev, bp->rx_ring_dma,
--		                             dest_idx * sizeof(dp),
--		                             DMA_BIDIRECTIONAL);
-+		b44_sync_dma_desc_for_device(bp->sdev, bp->rx_ring_dma,
-+			                    dest_idx * sizeof(dp),
-+			                    DMA_BIDIRECTIONAL);
- 
- 	return RX_PKT_BUF_SZ;
- }
-@@ -732,13 +732,12 @@ static void b44_recycle_rx(struct b44 *b
- 	rh = (struct rx_header *) src_map->skb->data;
- 	rh->len = 0;
- 	rh->flags = 0;
--	pci_unmap_addr_set(dest_map, mapping,
--			   pci_unmap_addr(src_map, mapping));
-+	dest_map->mapping = src_map->mapping;
- 
- 	if (bp->flags & B44_FLAG_RX_RING_HACK)
--		b44_sync_dma_desc_for_cpu(bp->pdev, bp->rx_ring_dma,
--		                          src_idx * sizeof(src_desc),
--		                          DMA_BIDIRECTIONAL);
-+		b44_sync_dma_desc_for_cpu(bp->sdev, bp->rx_ring_dma,
-+			                 src_idx * sizeof(src_desc),
-+			                 DMA_BIDIRECTIONAL);
- 
- 	ctrl = src_desc->ctrl;
- 	if (dest_idx == (B44_RX_RING_SIZE - 1))
-@@ -752,13 +751,13 @@ static void b44_recycle_rx(struct b44 *b
- 	src_map->skb = NULL;
- 
- 	if (bp->flags & B44_FLAG_RX_RING_HACK)
--		b44_sync_dma_desc_for_device(bp->pdev, bp->rx_ring_dma,
--		                             dest_idx * sizeof(dest_desc),
--		                             DMA_BIDIRECTIONAL);
--
--	pci_dma_sync_single_for_device(bp->pdev, le32_to_cpu(src_desc->addr),
--				       RX_PKT_BUF_SZ,
--				       PCI_DMA_FROMDEVICE);
-+		b44_sync_dma_desc_for_device(bp->sdev, bp->rx_ring_dma,
-+					     dest_idx * sizeof(dest_desc),
-+					     DMA_BIDIRECTIONAL);
-+
-+	dma_sync_single_for_device(bp->sdev->dev, le32_to_cpu(src_desc->addr),
-+				   RX_PKT_BUF_SZ,
-+				   DMA_FROM_DEVICE);
- }
- 
- static int b44_rx(struct b44 *bp, int budget)
-@@ -774,13 +773,13 @@ static int b44_rx(struct b44 *bp, int bu
- 	while (cons != prod && budget > 0) {
- 		struct ring_info *rp = &bp->rx_buffers[cons];
- 		struct sk_buff *skb = rp->skb;
--		dma_addr_t map = pci_unmap_addr(rp, mapping);
-+		dma_addr_t map = rp->mapping;
- 		struct rx_header *rh;
- 		u16 len;
- 
--		pci_dma_sync_single_for_cpu(bp->pdev, map,
-+		dma_sync_single_for_cpu(bp->sdev->dev, map,
- 					    RX_PKT_BUF_SZ,
--					    PCI_DMA_FROMDEVICE);
-+					    DMA_FROM_DEVICE);
- 		rh = (struct rx_header *) skb->data;
- 		len = le16_to_cpu(rh->len);
- 		if ((len > (RX_PKT_BUF_SZ - bp->rx_offset)) ||
-@@ -812,11 +811,11 @@ static int b44_rx(struct b44 *bp, int bu
- 			skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
- 			if (skb_size < 0)
- 				goto drop_it;
--			pci_unmap_single(bp->pdev, map,
--					 skb_size, PCI_DMA_FROMDEVICE);
-+			dma_unmap_single(bp->sdev->dev, map,
-+					 skb_size, DMA_FROM_DEVICE);
- 			/* Leave out rx_header */
--                	skb_put(skb, len+bp->rx_offset);
--            	        skb_pull(skb,bp->rx_offset);
-+	       	skb_put(skb, len+bp->rx_offset);
-+	   	        skb_pull(skb,bp->rx_offset);
- 		} else {
- 			struct sk_buff *copy_skb;
- 
-@@ -985,23 +984,24 @@ static int b44_start_xmit(struct sk_buff
- 		goto err_out;
- 	}
- 
--	mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
-+	mapping = dma_map_single(bp->sdev->dev, skb->data, len, DMA_TO_DEVICE);
- 	if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
- 		/* 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);
-+			dma_unmap_single(bp->sdev->dev, mapping, len,
-+					DMA_TO_DEVICE);
- 
- 		bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ,
- 					     GFP_ATOMIC|GFP_DMA);
- 		if (!bounce_skb)
- 			goto err_out;
- 
--		mapping = pci_map_single(bp->pdev, bounce_skb->data,
--					 len, PCI_DMA_TODEVICE);
-+		mapping = dma_map_single(bp->sdev->dev, bounce_skb->data,
-+					 len, DMA_TO_DEVICE);
- 		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);
-+				dma_unmap_single(bp->sdev->dev, mapping,
-+					 len, DMA_TO_DEVICE);
- 			dev_kfree_skb_any(bounce_skb);
- 			goto err_out;
- 		}
-@@ -1014,7 +1014,7 @@ static int b44_start_xmit(struct sk_buff
- 
- 	entry = bp->tx_prod;
- 	bp->tx_buffers[entry].skb = skb;
--	pci_unmap_addr_set(&bp->tx_buffers[entry], mapping, mapping);
-+	bp->tx_buffers[entry].mapping = mapping;
- 
- 	ctrl  = (len & DESC_CTRL_LEN);
- 	ctrl |= DESC_CTRL_IOC | DESC_CTRL_SOF | DESC_CTRL_EOF;
-@@ -1025,9 +1025,9 @@ static int b44_start_xmit(struct sk_buff
- 	bp->tx_ring[entry].addr = cpu_to_le32((u32) mapping+bp->dma_offset);
- 
- 	if (bp->flags & B44_FLAG_TX_RING_HACK)
--		b44_sync_dma_desc_for_device(bp->pdev, bp->tx_ring_dma,
--		                             entry * sizeof(bp->tx_ring[0]),
--		                             DMA_TO_DEVICE);
-+		b44_sync_dma_desc_for_device(bp->sdev, bp->tx_ring_dma,
-+			                    entry * sizeof(bp->tx_ring[0]),
-+			                    DMA_TO_DEVICE);
- 
- 	entry = NEXT_TX(entry);
- 
-@@ -1100,10 +1100,8 @@ static void b44_free_rings(struct b44 *b
- 
- 		if (rp->skb == NULL)
- 			continue;
--		pci_unmap_single(bp->pdev,
--				 pci_unmap_addr(rp, mapping),
--				 RX_PKT_BUF_SZ,
--				 PCI_DMA_FROMDEVICE);
-+		dma_unmap_single(bp->sdev->dev, rp->mapping, RX_PKT_BUF_SZ,
-+					DMA_FROM_DEVICE);
- 		dev_kfree_skb_any(rp->skb);
- 		rp->skb = NULL;
- 	}
-@@ -1114,10 +1112,8 @@ static void b44_free_rings(struct b44 *b
- 
- 		if (rp->skb == NULL)
- 			continue;
--		pci_unmap_single(bp->pdev,
--				 pci_unmap_addr(rp, mapping),
--				 rp->skb->len,
--				 PCI_DMA_TODEVICE);
-+		dma_unmap_single(bp->sdev->dev, rp->mapping, rp->skb->len,
-+					DMA_TO_DEVICE);
- 		dev_kfree_skb_any(rp->skb);
- 		rp->skb = NULL;
- 	}
-@@ -1139,14 +1135,14 @@ static void b44_init_rings(struct b44 *b
- 	memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
- 
- 	if (bp->flags & B44_FLAG_RX_RING_HACK)
--		dma_sync_single_for_device(&bp->pdev->dev, bp->rx_ring_dma,
--		                           DMA_TABLE_BYTES,
--		                           PCI_DMA_BIDIRECTIONAL);
-+		dma_sync_single_for_device(bp->sdev->dev, bp->rx_ring_dma,
-+			                  DMA_TABLE_BYTES,
-+			                  DMA_BIDIRECTIONAL);
- 
- 	if (bp->flags & B44_FLAG_TX_RING_HACK)
--		dma_sync_single_for_device(&bp->pdev->dev, bp->tx_ring_dma,
--		                           DMA_TABLE_BYTES,
--		                           PCI_DMA_TODEVICE);
-+		dma_sync_single_for_device(bp->sdev->dev, bp->tx_ring_dma,
-+			                  DMA_TABLE_BYTES,
-+			                  DMA_TO_DEVICE);
- 
- 	for (i = 0; i < bp->rx_pending; i++) {
- 		if (b44_alloc_rx_skb(bp, -1, i) < 0)
-@@ -1166,24 +1162,24 @@ static void b44_free_consistent(struct b
- 	bp->tx_buffers = NULL;
- 	if (bp->rx_ring) {
- 		if (bp->flags & B44_FLAG_RX_RING_HACK) {
--			dma_unmap_single(&bp->pdev->dev, bp->rx_ring_dma,
--				         DMA_TABLE_BYTES,
--				         DMA_BIDIRECTIONAL);
-+			dma_unmap_single(bp->sdev->dev, bp->rx_ring_dma,
-+					DMA_TABLE_BYTES,
-+					DMA_BIDIRECTIONAL);
- 			kfree(bp->rx_ring);
- 		} else
--			pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
-+			dma_free_coherent(bp->sdev->dev, DMA_TABLE_BYTES,
- 					    bp->rx_ring, bp->rx_ring_dma);
- 		bp->rx_ring = NULL;
- 		bp->flags &= ~B44_FLAG_RX_RING_HACK;
- 	}
- 	if (bp->tx_ring) {
- 		if (bp->flags & B44_FLAG_TX_RING_HACK) {
--			dma_unmap_single(&bp->pdev->dev, bp->tx_ring_dma,
--				         DMA_TABLE_BYTES,
--				         DMA_TO_DEVICE);
-+			dma_unmap_single(bp->sdev->dev, bp->tx_ring_dma,
-+					DMA_TABLE_BYTES,
-+					DMA_TO_DEVICE);
- 			kfree(bp->tx_ring);
- 		} else
--			pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
-+			dma_free_coherent(bp->sdev->dev, DMA_TABLE_BYTES,
- 					    bp->tx_ring, bp->tx_ring_dma);
- 		bp->tx_ring = NULL;
- 		bp->flags &= ~B44_FLAG_TX_RING_HACK;
-@@ -1194,22 +1190,22 @@ static void b44_free_consistent(struct b
-  * Must not be invoked with interrupt sources disabled and
-  * the hardware shutdown down.  Can sleep.
-  */
--static int b44_alloc_consistent(struct b44 *bp)
-+static int b44_alloc_consistent(struct b44 *bp, gfp_t gfp)
- {
- 	int size;
- 
- 	size  = B44_RX_RING_SIZE * sizeof(struct ring_info);
--	bp->rx_buffers = kzalloc(size, GFP_KERNEL);
-+	bp->rx_buffers = kzalloc(size, gfp);
- 	if (!bp->rx_buffers)
- 		goto out_err;
- 
- 	size = B44_TX_RING_SIZE * sizeof(struct ring_info);
--	bp->tx_buffers = kzalloc(size, GFP_KERNEL);
-+	bp->tx_buffers = kzalloc(size, gfp);
- 	if (!bp->tx_buffers)
- 		goto out_err;
- 
- 	size = DMA_TABLE_BYTES;
--	bp->rx_ring = pci_alloc_consistent(bp->pdev, size, &bp->rx_ring_dma);
-+	bp->rx_ring = dma_alloc_coherent(bp->sdev->dev, size, &bp->rx_ring_dma, gfp);
- 	if (!bp->rx_ring) {
- 		/* Allocation may have failed due to pci_alloc_consistent
- 		   insisting on use of GFP_DMA, which is more restrictive
-@@ -1217,13 +1213,13 @@ static int b44_alloc_consistent(struct b
- 		struct dma_desc *rx_ring;
- 		dma_addr_t rx_ring_dma;
- 
--		rx_ring = kzalloc(size, GFP_KERNEL);
-+		rx_ring = kzalloc(size, gfp);
- 		if (!rx_ring)
- 			goto out_err;
- 
--		rx_ring_dma = dma_map_single(&bp->pdev->dev, rx_ring,
--		                             DMA_TABLE_BYTES,
--		                             DMA_BIDIRECTIONAL);
-+		rx_ring_dma = dma_map_single(bp->sdev->dev, rx_ring,
-+			                    DMA_TABLE_BYTES,
-+			                    DMA_BIDIRECTIONAL);
- 
- 		if (dma_mapping_error(rx_ring_dma) ||
- 			rx_ring_dma + size > DMA_30BIT_MASK) {
-@@ -1236,21 +1232,21 @@ static int b44_alloc_consistent(struct b
- 		bp->flags |= B44_FLAG_RX_RING_HACK;
- 	}
- 
--	bp->tx_ring = pci_alloc_consistent(bp->pdev, size, &bp->tx_ring_dma);
-+	bp->tx_ring = dma_alloc_coherent(bp->sdev->dev, size, &bp->tx_ring_dma, gfp);
- 	if (!bp->tx_ring) {
--		/* Allocation may have failed due to pci_alloc_consistent
-+		/* Allocation may have failed due to dma_alloc_coherent
- 		   insisting on use of GFP_DMA, which is more restrictive
- 		   than necessary...  */
- 		struct dma_desc *tx_ring;
- 		dma_addr_t tx_ring_dma;
- 
--		tx_ring = kzalloc(size, GFP_KERNEL);
-+		tx_ring = kzalloc(size, gfp);
- 		if (!tx_ring)
- 			goto out_err;
- 
--		tx_ring_dma = dma_map_single(&bp->pdev->dev, tx_ring,
--		                             DMA_TABLE_BYTES,
--		                             DMA_TO_DEVICE);
-+		tx_ring_dma = dma_map_single(bp->sdev->dev, tx_ring,
-+			                    DMA_TABLE_BYTES,
-+			                    DMA_TO_DEVICE);
- 
- 		if (dma_mapping_error(tx_ring_dma) ||
- 			tx_ring_dma + size > DMA_30BIT_MASK) {
-@@ -1285,7 +1281,9 @@ static void b44_clear_stats(struct b44 *
- /* bp->lock is held. */
- static void b44_chip_reset(struct b44 *bp)
- {
--	if (ssb_is_core_up(bp)) {
-+	struct ssb_device *sdev = bp->sdev;
-+
-+	if (ssb_device_is_enabled(bp->sdev)) {
- 		bw32(bp, B44_RCV_LAZY, 0);
- 		bw32(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE);
- 		b44_wait_bit(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE, 200, 1);
-@@ -1297,19 +1295,25 @@ static void b44_chip_reset(struct b44 *b
- 		}
- 		bw32(bp, B44_DMARX_CTRL, 0);
- 		bp->rx_prod = bp->rx_cons = 0;
--	} else {
--		ssb_pci_setup(bp, (bp->core_unit == 0 ?
--				   SBINTVEC_ENET0 :
--				   SBINTVEC_ENET1));
--	}
--
--	ssb_core_reset(bp);
-+	} else
-+		ssb_pcicore_dev_irqvecs_enable(&sdev->bus->pcicore, sdev);
- 
-+	ssb_device_enable(bp->sdev, 0);
- 	b44_clear_stats(bp);
- 
--	/* Make PHY accessible. */
--	bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
--			     (0x0d & MDIO_CTRL_MAXF_MASK)));
-+	switch (sdev->bus->bustype) {
-+	case SSB_BUSTYPE_SSB:
-+		bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
-+		     (((ssb_clockspeed(sdev->bus) + (B44_MDC_RATIO / 2)) / B44_MDC_RATIO)
-+		     & MDIO_CTRL_MAXF_MASK)));
-+		break;
-+	case SSB_BUSTYPE_PCI:
-+	case SSB_BUSTYPE_PCMCIA:
-+		bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
-+		     (0x0d & MDIO_CTRL_MAXF_MASK)));
-+		break;
-+	}
-+
- 	br32(bp, B44_MDIO_CTRL);
- 
- 	if (!(br32(bp, B44_DEVCTRL) & DEVCTRL_IPP)) {
-@@ -1352,6 +1356,7 @@ static int b44_set_mac_addr(struct net_d
- {
- 	struct b44 *bp = netdev_priv(dev);
- 	struct sockaddr *addr = p;
-+ 	u32 val;
- 
- 	if (netif_running(dev))
- 		return -EBUSY;
-@@ -1362,7 +1367,11 @@ static int b44_set_mac_addr(struct net_d
- 	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
- 
- 	spin_lock_irq(&bp->lock);
--	__b44_set_mac_addr(bp);
-+
-+   	val = br32(bp, B44_RXCONFIG);
-+   	if (!(val & RXCONFIG_CAM_ABSENT))
-+		__b44_set_mac_addr(bp);
-+
- 	spin_unlock_irq(&bp->lock);
- 
- 	return 0;
-@@ -1419,7 +1428,7 @@ static int b44_open(struct net_device *d
- 	struct b44 *bp = netdev_priv(dev);
- 	int err;
- 
--	err = b44_alloc_consistent(bp);
-+	err = b44_alloc_consistent(bp, GFP_KERNEL);
- 	if (err)
- 		goto out;
- 
-@@ -1448,18 +1457,6 @@ out:
- 	return err;
- }
- 
--#if 0
--/*static*/ void b44_dump_state(struct b44 *bp)
--{
--	u32 val32, val32_2, val32_3, val32_4, val32_5;
--	u16 val16;
--
--	pci_read_config_word(bp->pdev, PCI_STATUS, &val16);
--	printk("DEBUG: PCI status [%04x] \n", val16);
--
--}
--#endif
--
- #ifdef CONFIG_NET_POLL_CONTROLLER
- /*
-  * Polling receive - used by netconsole and other diagnostic tools
-@@ -1571,10 +1568,25 @@ static void b44_setup_pseudo_magicp(stru
- 
- }
- 
-+#ifdef CONFIG_B44_PCI
-+static void b44_setup_wol_pci(struct b44 *bp)
-+{
-+	u16 val;
-+
-+	if (bp->sdev->bus->bustype != SSB_BUSTYPE_SSB) {
-+		val = br32(bp, SSB_TMSLOW);
-+		bw32(bp, SSB_TMSLOW, val | SSB_TMSLOW_PE);
-+		pci_read_config_word(bp->sdev->bus->host_pci, SSB_PMCSR, &val);
-+		pci_write_config_word(bp->sdev->bus->host_pci, SSB_PMCSR, val | SSB_PE);
-+	}
-+}
-+#else
-+static inline void b44_setup_wol_pci(struct b44 *bp) { }
-+#endif /* CONFIG_B44_PCI */
-+
- static void b44_setup_wol(struct b44 *bp)
- {
- 	u32 val;
--	u16 pmval;
- 
- 	bw32(bp, B44_RXCONFIG, RXCONFIG_ALLMULTI);
- 
-@@ -1598,13 +1610,7 @@ static void b44_setup_wol(struct b44 *bp
-  	} else {
-  		b44_setup_pseudo_magicp(bp);
-  	}
--
--	val = br32(bp, B44_SBTMSLOW);
--	bw32(bp, B44_SBTMSLOW, val | SBTMSLOW_PE);
--
--	pci_read_config_word(bp->pdev, SSB_PMCSR, &pmval);
--	pci_write_config_word(bp->pdev, SSB_PMCSR, pmval | SSB_PE);
--
-+	b44_setup_wol_pci(bp);
- }
- 
- static int b44_close(struct net_device *dev)
-@@ -1619,9 +1625,6 @@ static int b44_close(struct net_device *
- 
- 	spin_lock_irq(&bp->lock);
- 
--#if 0
--	b44_dump_state(bp);
--#endif
- 	b44_halt(bp);
- 	b44_free_rings(bp);
- 	netif_carrier_off(dev);
-@@ -1704,7 +1707,7 @@ static void __b44_set_rx_mode(struct net
- 
- 	val = br32(bp, B44_RXCONFIG);
- 	val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
--	if (dev->flags & IFF_PROMISC) {
-+	if ((dev->flags & IFF_PROMISC) || (val & RXCONFIG_CAM_ABSENT)) {
- 		val |= RXCONFIG_PROMISC;
- 		bw32(bp, B44_RXCONFIG, val);
- 	} else {
-@@ -1752,11 +1755,19 @@ static void b44_set_msglevel(struct net_
- static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)
- {
- 	struct b44 *bp = netdev_priv(dev);
--	struct pci_dev *pci_dev = bp->pdev;
-+	struct ssb_bus *bus = bp->sdev->bus;
- 
--	strcpy (info->driver, DRV_MODULE_NAME);
--	strcpy (info->version, DRV_MODULE_VERSION);
--	strcpy (info->bus_info, pci_name(pci_dev));
-+	strncpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
-+	strncpy(info->version, DRV_MODULE_VERSION, sizeof(info->driver));
-+	switch (bus->bustype) {
-+	case SSB_BUSTYPE_PCI:
-+		strncpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
-+		break;
-+	case SSB_BUSTYPE_PCMCIA:
-+	case SSB_BUSTYPE_SSB:
-+		strncpy(info->bus_info, "SSB", sizeof(info->bus_info));
-+		break;
-+	}
- }
- 
- static int b44_nway_reset(struct net_device *dev)
-@@ -2056,33 +2067,23 @@ out:
- 	return err;
- }
- 
--/* Read 128-bytes of EEPROM. */
--static int b44_read_eeprom(struct b44 *bp, u8 *data)
--{
--	long i;
--	__le16 *ptr = (__le16 *) data;
--
--	for (i = 0; i < 128; i += 2)
--		ptr[i / 2] = cpu_to_le16(readw(bp->regs + 4096 + i));
--
--	return 0;
--}
--
- static int __devinit b44_get_invariants(struct b44 *bp)
- {
--	u8 eeprom[128];
--	int err;
--
--	err = b44_read_eeprom(bp, &eeprom[0]);
--	if (err)
--		goto out;
--
--	bp->dev->dev_addr[0] = eeprom[79];
--	bp->dev->dev_addr[1] = eeprom[78];
--	bp->dev->dev_addr[2] = eeprom[81];
--	bp->dev->dev_addr[3] = eeprom[80];
--	bp->dev->dev_addr[4] = eeprom[83];
--	bp->dev->dev_addr[5] = eeprom[82];
-+	struct ssb_device *sdev = bp->sdev;
-+	int err = 0;
-+	u8 *addr;
-+
-+	bp->dma_offset = ssb_dma_translation(sdev);
-+
-+	if (sdev->bus->bustype == SSB_BUSTYPE_SSB &&
-+	    instance > 1) {
-+		addr = sdev->bus->sprom.r1.et1mac;
-+		bp->phy_addr = sdev->bus->sprom.r1.et1phyaddr;
-+	} else {
-+		addr = sdev->bus->sprom.r1.et0mac;
-+		bp->phy_addr = sdev->bus->sprom.r1.et0phyaddr;
-+	}
-+	memcpy(bp->dev->dev_addr, addr, 6);
- 
- 	if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
- 		printk(KERN_ERR PFX "Invalid MAC address found in EEPROM\n");
-@@ -2091,108 +2092,55 @@ static int __devinit b44_get_invariants(
- 
- 	memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len);
- 
--	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);
--	bp->dma_offset = SB_PCI_DMA;
--
- 	/* XXX - really required?
- 	   bp->flags |= B44_FLAG_BUGGY_TXPTR;
--         */
-+	*/
- 
-- 	if (ssb_get_core_rev(bp) >= 7)
-- 		bp->flags |= B44_FLAG_B0_ANDLATER;
-+	if (bp->sdev->id.revision >= 7)
-+		bp->flags |= B44_FLAG_B0_ANDLATER;
- 
--out:
- 	return err;
- }
- 
--static int __devinit b44_init_one(struct pci_dev *pdev,
--				  const struct pci_device_id *ent)
-+static int __devinit b44_init_one(struct ssb_device *sdev,
-+				  const struct ssb_device_id *ent)
- {
- 	static int b44_version_printed = 0;
--	unsigned long b44reg_base, b44reg_len;
- 	struct net_device *dev;
- 	struct b44 *bp;
- 	int err, i;
- 
-+	instance++;
-+
- 	if (b44_version_printed++ == 0)
- 		printk(KERN_INFO "%s", version);
- 
--	err = pci_enable_device(pdev);
--	if (err) {
--		dev_err(&pdev->dev, "Cannot enable PCI device, "
--		       "aborting.\n");
--		return err;
--	}
--
--	if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
--		dev_err(&pdev->dev,
--			"Cannot find proper PCI device "
--		       "base address, aborting.\n");
--		err = -ENODEV;
--		goto err_out_disable_pdev;
--	}
--
--	err = pci_request_regions(pdev, DRV_MODULE_NAME);
--	if (err) {
--		dev_err(&pdev->dev,
--			"Cannot obtain PCI resources, aborting.\n");
--		goto err_out_disable_pdev;
--	}
--
--	pci_set_master(pdev);
--
--	err = pci_set_dma_mask(pdev, (u64) DMA_30BIT_MASK);
--	if (err) {
--		dev_err(&pdev->dev, "No usable DMA configuration, aborting.\n");
--		goto err_out_free_res;
--	}
--
--	err = pci_set_consistent_dma_mask(pdev, (u64) DMA_30BIT_MASK);
--	if (err) {
--		dev_err(&pdev->dev, "No usable DMA configuration, aborting.\n");
--		goto err_out_free_res;
--	}
--
--	b44reg_base = pci_resource_start(pdev, 0);
--	b44reg_len = pci_resource_len(pdev, 0);
--
- 	dev = alloc_etherdev(sizeof(*bp));
- 	if (!dev) {
--		dev_err(&pdev->dev, "Etherdev alloc failed, aborting.\n");
-+		dev_err(sdev->dev, "Etherdev alloc failed, aborting.\n");
- 		err = -ENOMEM;
--		goto err_out_free_res;
-+		goto out;
- 	}
- 
- 	SET_MODULE_OWNER(dev);
--	SET_NETDEV_DEV(dev,&pdev->dev);
-+	SET_NETDEV_DEV(dev, sdev->dev);
- 
- 	/* No interesting netdevice features in this card... */
- 	dev->features |= 0;
- 
- 	bp = netdev_priv(dev);
--	bp->pdev = pdev;
-+	bp->sdev = sdev;
- 	bp->dev = dev;
- 
- 	bp->msg_enable = netif_msg_init(b44_debug, B44_DEF_MSG_ENABLE);
- 
- 	spin_lock_init(&bp->lock);
- 
--	bp->regs = ioremap(b44reg_base, b44reg_len);
--	if (bp->regs == 0UL) {
--		dev_err(&pdev->dev, "Cannot map device registers, aborting.\n");
--		err = -ENOMEM;
--		goto err_out_free_dev;
--	}
--
- 	bp->rx_pending = B44_DEF_RX_RING_PENDING;
- 	bp->tx_pending = B44_DEF_TX_RING_PENDING;
- 
-@@ -2211,16 +2159,22 @@ static int __devinit b44_init_one(struct
- 	dev->poll_controller = b44_poll_controller;
- #endif
- 	dev->change_mtu = b44_change_mtu;
--	dev->irq = pdev->irq;
-+	dev->irq = sdev->irq;
- 	SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
- 
- 	netif_carrier_off(dev);
- 
-+	err = ssb_dma_set_mask(sdev, DMA_30BIT_MASK);
-+	if (err) {
-+		dev_err(sdev->dev,
-+			"Required 30BIT DMA mask unsupported by the system.\n");
-+		goto err_out_free_dev;
-+	}
- 	err = b44_get_invariants(bp);
- 	if (err) {
--		dev_err(&pdev->dev,
-+		dev_err(sdev->dev,
- 			"Problem fetching invariants of chip, aborting.\n");
--		goto err_out_iounmap;
-+		goto err_out_free_dev;
- 	}
- 
- 	bp->mii_if.dev = dev;
-@@ -2239,61 +2193,47 @@ static int __devinit b44_init_one(struct
- 
- 	err = register_netdev(dev);
- 	if (err) {
--		dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
--		goto err_out_iounmap;
-+		dev_err(sdev->dev, "Cannot register net device, aborting.\n");
-+		goto out;
- 	}
- 
--	pci_set_drvdata(pdev, dev);
--
--	pci_save_state(bp->pdev);
-+	ssb_set_drvdata(sdev, dev);
- 
- 	/* Chip reset provides power to the b44 MAC & PCI cores, which
- 	 * is necessary for MAC register access.
- 	 */
- 	b44_chip_reset(bp);
- 
--	printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
-+	printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet ", dev->name);
- 	for (i = 0; i < 6; i++)
- 		printk("%2.2x%c", dev->dev_addr[i],
- 		       i == 5 ? '\n' : ':');
- 
- 	return 0;
- 
--err_out_iounmap:
--	iounmap(bp->regs);
--
- err_out_free_dev:
- 	free_netdev(dev);
- 
--err_out_free_res:
--	pci_release_regions(pdev);
--
--err_out_disable_pdev:
--	pci_disable_device(pdev);
--	pci_set_drvdata(pdev, NULL);
-+out:
- 	return err;
- }
- 
--static void __devexit b44_remove_one(struct pci_dev *pdev)
-+static void __devexit b44_remove_one(struct ssb_device *pdev)
- {
--	struct net_device *dev = pci_get_drvdata(pdev);
--	struct b44 *bp = netdev_priv(dev);
-+	struct net_device *dev = ssb_get_drvdata(pdev);
- 
- 	unregister_netdev(dev);
--	iounmap(bp->regs);
- 	free_netdev(dev);
--	pci_release_regions(pdev);
--	pci_disable_device(pdev);
--	pci_set_drvdata(pdev, NULL);
-+	ssb_set_drvdata(pdev, NULL);
- }
- 
--static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
-+static int b44_suspend(struct ssb_device *sdev, pm_message_t state)
- {
--	struct net_device *dev = pci_get_drvdata(pdev);
-+	struct net_device *dev = ssb_get_drvdata(sdev);
- 	struct b44 *bp = netdev_priv(dev);
- 
-         if (!netif_running(dev))
--                 return 0;
-+		return 0;
- 
- 	del_timer_sync(&bp->timer);
- 
-@@ -2311,33 +2251,22 @@ static int b44_suspend(struct pci_dev *p
- 		b44_init_hw(bp, B44_PARTIAL_RESET);
- 		b44_setup_wol(bp);
- 	}
--	pci_disable_device(pdev);
-+
- 	return 0;
- }
- 
--static int b44_resume(struct pci_dev *pdev)
-+static int b44_resume(struct ssb_device *sdev)
- {
--	struct net_device *dev = pci_get_drvdata(pdev);
-+	struct net_device *dev = ssb_get_drvdata(sdev);
- 	struct b44 *bp = netdev_priv(dev);
- 	int rc = 0;
- 
--	pci_restore_state(pdev);
--	rc = pci_enable_device(pdev);
--	if (rc) {
--		printk(KERN_ERR PFX "%s: pci_enable_device failed\n",
--			dev->name);
--		return rc;
--	}
--
--	pci_set_master(pdev);
--
- 	if (!netif_running(dev))
- 		return 0;
- 
- 	rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);
- 	if (rc) {
- 		printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
--		pci_disable_device(pdev);
- 		return rc;
- 	}
- 
-@@ -2356,29 +2285,53 @@ static int b44_resume(struct pci_dev *pd
- 	return 0;
- }
- 
--static struct pci_driver b44_driver = {
-+static struct ssb_driver b44_ssb_driver = {
- 	.name		= DRV_MODULE_NAME,
--	.id_table	= b44_pci_tbl,
-+	.id_table	= b44_ssb_tbl,
- 	.probe		= b44_init_one,
- 	.remove		= __devexit_p(b44_remove_one),
--        .suspend        = b44_suspend,
--        .resume         = b44_resume,
-+	.suspend	= b44_suspend,
-+	.resume		= b44_resume,
- };
- 
-+static inline int b44_pci_init(void)
-+{
-+	int err = 0;
-+#ifdef CONFIG_B44_PCI
-+	err = ssb_pcihost_register(&b44_pci_driver);
-+#endif
-+	return err;
-+}
-+
-+static inline void b44_pci_exit(void)
-+{
-+#ifdef CONFIG_B44_PCI
-+	ssb_pcihost_unregister(&b44_pci_driver);
-+#endif
-+}
-+
- static int __init b44_init(void)
- {
- 	unsigned int dma_desc_align_size = dma_get_cache_alignment();
-+	int err;
- 
- 	/* Setup paramaters for syncing RX/TX DMA descriptors */
- 	dma_desc_align_mask = ~(dma_desc_align_size - 1);
- 	dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
- 
--	return pci_register_driver(&b44_driver);
-+	err = b44_pci_init();
-+	if (err)
-+		return err;
-+	err = ssb_driver_register(&b44_ssb_driver);
-+	if (err)
-+		b44_pci_exit();
-+	return err;
- }
- 
- static void __exit b44_cleanup(void)
- {
--	pci_unregister_driver(&b44_driver);
-+	ssb_driver_unregister(&b44_ssb_driver);
-+	b44_pci_exit();
- }
- 
- module_init(b44_init);
---- linux-2.6.21.noarch/drivers/net/Kconfig.orig	2007-06-25 09:16:43.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/Kconfig	2007-06-25 09:55:35.000000000 -0400
-@@ -1387,18 +1387,36 @@ config APRICOT
- 	  called apricot.
- 
- config B44
--	tristate "Broadcom 4400 ethernet support"
--	depends on NET_PCI && PCI
-+	tristate "Broadcom 440x/47xx ethernet support"
-+	select SSB
- 	select MII
- 	help
--	  If you have a network (Ethernet) controller of this type, say Y and
--	  read the Ethernet-HOWTO, available from
-+	  If you have a network (Ethernet) controller of this type, say Y
-+	  or M and read the Ethernet-HOWTO, available from
- 	  <http://www.tldp.org/docs.html#howto>.
- 
-+	  If you have a Broadcom 440x PCI device (and if you don't
-+	  know, you _do_ have one) you must also select the options
-+	  "EISA, VLB, PCI and on board controllers" above and
-+	  "Broadcom 440x PCI device support" below.
-+
- 	  To compile this driver as a module, choose M here and read
- 	  <file:Documentation/networking/net-modules.txt>.  The module will be
- 	  called b44.
- 
-+config B44_PCI
-+	bool "Broadcom 440x PCI device support"
-+	depends on B44 && NET_PCI
-+	select SSB_PCIHOST
-+	select SSB_DRIVER_PCICORE
-+	default y
-+	help
-+	  Support for Broadcom 440x PCI devices.
-+
-+	  Say Y, unless you know what you are doing.
-+	  If you say N here I will _not_ listen to your
-+	  bugreports!
-+
- config FORCEDETH
- 	tristate "nForce Ethernet support"
- 	depends on NET_PCI && PCI
 --- linux-2.6.21.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig	2007-06-25 09:16:46.000000000 -0400
 +++ linux-2.6.21.noarch/drivers/net/wireless/zd1211rw/Kconfig	2007-06-25 09:55:35.000000000 -0400
 @@ -1,6 +1,7 @@


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.3009
retrieving revision 1.3010
diff -u -r1.3009 -r1.3010
--- kernel-2.6.spec	14 Aug 2007 21:05:27 -0000	1.3009
+++ kernel-2.6.spec	15 Aug 2007 15:22:32 -0000	1.3010
@@ -2217,6 +2217,9 @@
 %endif
 
 %changelog
+* Wed Aug 15 2007 John W. Linville <linville redhat com>
+- Remove b44 bits from git-wireless-dev.patch (broken and unnecessary)
+
 * Tue Aug 14 2007 Chuck Ebbert <cebbert redhat com>
 - update CFS scheduler
 - revert "don't BUG on too-large memory allocation"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]