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

Conflicts:
	drivers/net/igb/igb_main.c
	drivers/net/qlge/qlge_main.c
	drivers/net/wireless/ath9k/ath9k.h
	drivers/net/wireless/ath9k/core.h
	drivers/net/wireless/ath9k/hw.c

1 files changed, 2 insertions, 120 deletions

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 7e4b586e306d..06c535222666 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -81,9 +81,9 @@ static const int multicast_filter_limit = 32;
 #define RTL8169_TX_TIMEOUT      (6*HZ)
 #define RTL8169_PHY_TIMEOUT     (10*HZ)
 
-#define RTL_EEPROM_SIG          0x8129
+#define RTL_EEPROM_SIG          cpu_to_le32(0x8129)
+#define RTL_EEPROM_SIG_MASK     cpu_to_le32(0xffff)
 #define RTL_EEPROM_SIG_ADDR     0x0000
-#define RTL_EEPROM_MAC_ADDR     0x0007
 
 /* write/read MMIO register */
 #define RTL_W8(reg, val8)       writeb ((val8), ioaddr + (reg))
@@ -293,11 +293,6 @@ enum rtl_register_content {
         /* Cfg9346Bits */
         Cfg9346_Lock    = 0x00,
         Cfg9346_Unlock  = 0xc0,
-        Cfg9346_Program = 0x80,         /* Programming mode */
-        Cfg9346_EECS    = 0x08,         /* Chip select */
-        Cfg9346_EESK    = 0x04,         /* Serial data clock */
-        Cfg9346_EEDI    = 0x02,         /* Data input */
-        Cfg9346_EEDO    = 0x01,         /* Data output */
 
         /* rx_mode_bits */
         AcceptErr       = 0x20,
@@ -310,7 +305,6 @@ enum rtl_register_content {
         /* RxConfigBits */
         RxCfgFIFOShift  = 13,
         RxCfgDMAShift   =  8,
-        RxCfg9356SEL    =  6,           /* EEPROM type: 0 = 9346, 1 = 9356 */
 
         /* TxConfigBits */
         TxInterFrameGapShift = 24,
@@ -1969,108 +1963,6 @@ static const struct net_device_ops rtl8169_netdev_ops = {
 
 };
 
-/* Delay between EEPROM clock transitions. Force out buffered PCI writes. */
-#define RTL_EEPROM_DELAY()      RTL_R8(Cfg9346)
-#define RTL_EEPROM_READ_CMD     6
-
-/* read 16bit word stored in EEPROM. EEPROM is addressed by words. */
-static u16 rtl_eeprom_read(void __iomem *ioaddr, int addr)
-{
-        u16 result = 0;
-        int cmd, cmd_len, i;
-
-        /* check for EEPROM address size (in bits) */
-        if (RTL_R32(RxConfig) & (1 << RxCfg9356SEL)) {
-                /* EEPROM is 93C56 */
-                cmd_len = 3 + 8; /* 3 bits for command id and 8 for address */
-                cmd = (RTL_EEPROM_READ_CMD << 8) | (addr & 0xff);
-        } else {
-                /* EEPROM is 93C46 */
-                cmd_len = 3 + 6; /* 3 bits for command id and 6 for address */
-                cmd = (RTL_EEPROM_READ_CMD << 6) | (addr & 0x3f);
-        }
-
-        /* enter programming mode */
-        RTL_W8(Cfg9346, Cfg9346_Program | Cfg9346_EECS);
-        RTL_EEPROM_DELAY();
-
-        /* write command and requested address */
-        while (cmd_len--) {
-                u8 x = Cfg9346_Program | Cfg9346_EECS;
-
-                x |= (cmd & (1 << cmd_len)) ? Cfg9346_EEDI : 0;
-
-                /* write a bit */
-                RTL_W8(Cfg9346, x);
-                RTL_EEPROM_DELAY();
-
-                /* raise clock */
-                RTL_W8(Cfg9346, x | Cfg9346_EESK);
-                RTL_EEPROM_DELAY();
-        }
-
-        /* lower clock */
-        RTL_W8(Cfg9346, Cfg9346_Program | Cfg9346_EECS);
-        RTL_EEPROM_DELAY();
-
-        /* read back 16bit value */
-        for (i = 16; i > 0; i--) {
-                /* raise clock */
-                RTL_W8(Cfg9346, Cfg9346_Program | Cfg9346_EECS | Cfg9346_EESK);
-                RTL_EEPROM_DELAY();
-
-                result <<= 1;
-                result |= (RTL_R8(Cfg9346) & Cfg9346_EEDO) ? 1 : 0;
-
-                /* lower clock */
-                RTL_W8(Cfg9346, Cfg9346_Program | Cfg9346_EECS);
-                RTL_EEPROM_DELAY();
-        }
-
-        RTL_W8(Cfg9346, Cfg9346_Program);
-        /* leave programming mode */
-        RTL_W8(Cfg9346, Cfg9346_Lock);
-
-        return result;
-}
-
-static void rtl_init_mac_address(struct rtl8169_private *tp,
-                                 void __iomem *ioaddr)
-{
-        struct pci_dev *pdev = tp->pci_dev;
-        u16 x;
-        u8 mac[8];
-
-        /* read EEPROM signature */
-        x = rtl_eeprom_read(ioaddr, RTL_EEPROM_SIG_ADDR);
-
-        if (x != RTL_EEPROM_SIG) {
-                dev_info(&pdev->dev, "Missing EEPROM signature: %04x\n", x);
-                return;
-        }
-
-        /* read MAC address */
-        x = rtl_eeprom_read(ioaddr, RTL_EEPROM_MAC_ADDR);
-        mac[0] = x & 0xff;
-        mac[1] = x >> 8;
-        x = rtl_eeprom_read(ioaddr, RTL_EEPROM_MAC_ADDR + 1);
-        mac[2] = x & 0xff;
-        mac[3] = x >> 8;
-        x = rtl_eeprom_read(ioaddr, RTL_EEPROM_MAC_ADDR + 2);
-        mac[4] = x & 0xff;
-        mac[5] = x >> 8;
-
-        if (netif_msg_probe(tp)) {
-                DECLARE_MAC_BUF(buf);
-
-                dev_info(&pdev->dev, "MAC address found in EEPROM: %s\n",
-                         print_mac(buf, mac));
-        }
-
-        if (is_valid_ether_addr(mac))
-                rtl_rar_set(tp, mac);
-}
-
 static int __devinit
 rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -2249,8 +2141,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         tp->mmio_addr = ioaddr;
 
-        rtl_init_mac_address(tp, ioaddr);
-
         /* Get MAC address */
         for (i = 0; i < MAC_ADDR_LEN; i++)
                 dev->dev_addr[i] = RTL_R8(MAC0 + i);
@@ -3363,13 +3253,6 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 opts1 |= FirstFrag;
         } else {
                 len = skb->len;
-
-                if (unlikely(len < ETH_ZLEN)) {
-                        if (skb_padto(skb, ETH_ZLEN))
-                                goto err_update_stats;
-                        len = ETH_ZLEN;
-                }
-
                 opts1 |= FirstFrag | LastFrag;
                 tp->tx_skb[entry].skb = skb;
         }
@@ -3407,7 +3290,6 @@ out:
 err_stop:
         netif_stop_queue(dev);
         ret = NETDEV_TX_BUSY;
-err_update_stats:
         dev->stats.tx_dropped++;
         goto out;
 }