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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
  [NETFILTER]: Fix non-ANSI func. decl.
  [TG3]: Identify Serdes devices more clearly.
  [TG3]: Use msleep.
  [TG3]: Use netif_msg_*.
  [TG3]: Allow partial speed advertisement.
  [TG3]: Add TG3_FLG2_IS_NIC flag.
  [TG3]: Add 5787F device ID.
  [TG3]: Fix Phy loopback.
  [WANROUTER]: Kill kmalloc debugging code.
  [TCP] inet_twdr_hangman: Delete unnecessary memory barrier().
  [NET]: Memory barrier cleanups
  [IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
  audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
  audit: Add auditing to ipsec
  [IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=n
  [IrDA]: Incorrect TTP header reservation
  [IrDA]: PXA FIR code device model conversion
  [GENETLINK]: Fix misplaced command flags.
  [NETLIK]: Add a pointer to the Generic Netlink wiki page.
  [IPV6] RAW: Don't release unlocked sock.
  ...

3 files changed, 96 insertions, 73 deletions

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index f9a1c88a428..9137e239fac 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -704,9 +704,9 @@ static int pxa_irda_stop(struct net_device *dev)
         return 0;
 }
 
-static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
+static int pxa_irda_suspend(struct platform_device *_dev, pm_message_t state)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(_dev);
         struct pxa_irda *si;
 
         if (dev && netif_running(dev)) {
@@ -718,9 +718,9 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int pxa_irda_resume(struct device *_dev)
+static int pxa_irda_resume(struct platform_device *_dev)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(_dev);
         struct pxa_irda *si;
 
         if (dev && netif_running(dev)) {
@@ -746,9 +746,8 @@ static int pxa_irda_init_iobuf(iobuff_t *io, int size)
         return io->head ? 0 : -ENOMEM;
 }
 
-static int pxa_irda_probe(struct device *_dev)
+static int pxa_irda_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(_dev);
         struct net_device *dev;
         struct pxa_irda *si;
         unsigned int baudrate_mask;
@@ -822,9 +821,9 @@ err_mem_1:
         return err;
 }
 
-static int pxa_irda_remove(struct device *_dev)
+static int pxa_irda_remove(struct platform_device *_dev)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(_dev);
 
         if (dev) {
                 struct pxa_irda *si = netdev_priv(dev);
@@ -840,9 +839,10 @@ static int pxa_irda_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver pxa_ir_driver = {
-        .name           = "pxa2xx-ir",
-        .bus            = &platform_bus_type,
+static struct platform_driver pxa_ir_driver = {
+        .driver         = {
+                .name   = "pxa2xx-ir",
+        },
         .probe          = pxa_irda_probe,
         .remove         = pxa_irda_remove,
         .suspend        = pxa_irda_suspend,
@@ -851,12 +851,12 @@ static struct device_driver pxa_ir_driver = {
 
 static int __init pxa_irda_init(void)
 {
-        return driver_register(&pxa_ir_driver);
+        return platform_driver_register(&pxa_ir_driver);
 }
 
 static void __exit pxa_irda_exit(void)
 {
-        driver_unregister(&pxa_ir_driver);
+        platform_driver_unregister(&pxa_ir_driver);
 }
 
 module_init(pxa_irda_init);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index d9123c9adc1..571320ae87a 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.69"
-#define DRV_MODULE_RELDATE      "November 15, 2006"
+#define DRV_MODULE_VERSION      "3.70"
+#define DRV_MODULE_RELDATE      "December 1, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -192,6 +192,7 @@ static struct pci_device_id tg3_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787F)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715)},
@@ -1061,7 +1062,7 @@ static void tg3_frob_aux_power(struct tg3 *tp)
 {
         struct tg3 *tp_peer = tp;
 
-        if ((tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) != 0)
+        if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0)
                 return;
 
         if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
@@ -1212,8 +1213,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                                       power_control);
                 udelay(100);    /* Delay after power state change */
 
-                /* Switch out of Vaux if it is not a LOM */
-                if (!(tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT))
+                /* Switch out of Vaux if it is a NIC */
+                if (tp->tg3_flags2 & TG3_FLG2_IS_NIC)
                         tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl, 100);
 
                 return 0;
@@ -1401,8 +1402,10 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 static void tg3_link_report(struct tg3 *tp)
 {
         if (!netif_carrier_ok(tp->dev)) {
-                printk(KERN_INFO PFX "%s: Link is down.\n", tp->dev->name);
-        } else {
+                if (netif_msg_link(tp))
+                        printk(KERN_INFO PFX "%s: Link is down.\n",
+                               tp->dev->name);
+        } else if (netif_msg_link(tp)) {
                 printk(KERN_INFO PFX "%s: Link is up at %d Mbps, %s duplex.\n",
                        tp->dev->name,
                        (tp->link_config.active_speed == SPEED_1000 ?
@@ -1557,12 +1560,6 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
 
                 tg3_writephy(tp, MII_ADVERTISE, new_adv);
         } else if (tp->link_config.speed == SPEED_INVALID) {
-                tp->link_config.advertising =
-                        (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-                         ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
-                         ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
-                         ADVERTISED_Autoneg | ADVERTISED_MII);
-
                 if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
                         tp->link_config.advertising &=
                                 ~(ADVERTISED_1000baseT_Half |
@@ -1706,25 +1703,36 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)
         return err;
 }
 
-static int tg3_copper_is_advertising_all(struct tg3 *tp)
+static int tg3_copper_is_advertising_all(struct tg3 *tp, u32 mask)
 {
-        u32 adv_reg, all_mask;
+        u32 adv_reg, all_mask = 0;
+
+        if (mask & ADVERTISED_10baseT_Half)
+                all_mask |= ADVERTISE_10HALF;
+        if (mask & ADVERTISED_10baseT_Full)
+                all_mask |= ADVERTISE_10FULL;
+        if (mask & ADVERTISED_100baseT_Half)
+                all_mask |= ADVERTISE_100HALF;
+        if (mask & ADVERTISED_100baseT_Full)
+                all_mask |= ADVERTISE_100FULL;
 
         if (tg3_readphy(tp, MII_ADVERTISE, &adv_reg))
                 return 0;
 
-        all_mask = (ADVERTISE_10HALF | ADVERTISE_10FULL |
-                    ADVERTISE_100HALF | ADVERTISE_100FULL);
         if ((adv_reg & all_mask) != all_mask)
                 return 0;
         if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
                 u32 tg3_ctrl;
 
+                all_mask = 0;
+                if (mask & ADVERTISED_1000baseT_Half)
+                        all_mask |= ADVERTISE_1000HALF;
+                if (mask & ADVERTISED_1000baseT_Full)
+                        all_mask |= ADVERTISE_1000FULL;
+
                 if (tg3_readphy(tp, MII_TG3_CTRL, &tg3_ctrl))
                         return 0;
 
-                all_mask = (MII_TG3_CTRL_ADV_1000_HALF |
-                            MII_TG3_CTRL_ADV_1000_FULL);
                 if ((tg3_ctrl & all_mask) != all_mask)
                         return 0;
         }
@@ -1884,7 +1892,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
                                 /* Force autoneg restart if we are exiting
                                  * low power mode.
                                  */
-                                if (!tg3_copper_is_advertising_all(tp))
+                                if (!tg3_copper_is_advertising_all(tp,
+                                                tp->link_config.advertising))
                                         current_link_up = 0;
                         } else {
                                 current_link_up = 0;
@@ -3703,8 +3712,9 @@ static void tg3_tx_timeout(struct net_device *dev)
 {
         struct tg3 *tp = netdev_priv(dev);
 
-        printk(KERN_ERR PFX "%s: transmit timed out, resetting\n",
-               dev->name);
+        if (netif_msg_tx_err(tp))
+                printk(KERN_ERR PFX "%s: transmit timed out, resetting\n",
+                       dev->name);
 
         schedule_work(&tp->reset_task);
 }
@@ -6396,16 +6406,17 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         udelay(40);
 
         /* tp->grc_local_ctrl is partially set up during tg3_get_invariants().
-         * If TG3_FLAG_EEPROM_WRITE_PROT is set, we should read the
+         * If TG3_FLG2_IS_NIC is zero, we should read the
          * register to preserve the GPIO settings for LOMs. The GPIOs,
          * whether used as inputs or outputs, are set by boot code after
          * reset.
          */
-        if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
+        if (!(tp->tg3_flags2 & TG3_FLG2_IS_NIC)) {
                 u32 gpio_mask;
 
-                gpio_mask = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE2 |
-                            GRC_LCLCTRL_GPIO_OUTPUT0 | GRC_LCLCTRL_GPIO_OUTPUT2;
+                gpio_mask = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE1 |
+                            GRC_LCLCTRL_GPIO_OE2 | GRC_LCLCTRL_GPIO_OUTPUT0 |
+                            GRC_LCLCTRL_GPIO_OUTPUT1 | GRC_LCLCTRL_GPIO_OUTPUT2;
 
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
                         gpio_mask |= GRC_LCLCTRL_GPIO_OE3 |
@@ -6417,8 +6428,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask;
 
                 /* GPIO1 must be driven high for eeprom write protect */
-                tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
-                                       GRC_LCLCTRL_GPIO_OUTPUT1);
+                if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT)
+                        tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
+                                               GRC_LCLCTRL_GPIO_OUTPUT1);
         }
         tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
         udelay(100);
@@ -8656,7 +8668,9 @@ static int tg3_test_registers(struct tg3 *tp)
         return 0;
 
 out:
-        printk(KERN_ERR PFX "Register test failed at offset %x\n", offset);
+        if (netif_msg_hw(tp))
+                printk(KERN_ERR PFX "Register test failed at offset %x\n",
+                       offset);
         tw32(offset, save_val);
         return -EIO;
 }
@@ -8781,17 +8795,20 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                                         tg3_writephy(tp, 0x10, phy & ~0x4000);
                                 tg3_writephy(tp, MII_TG3_EPHY_TEST, phytest);
                         }
-                }
-                val = BMCR_LOOPBACK | BMCR_FULLDPLX;
-                if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
-                        val |= BMCR_SPEED100;
-                else
-                        val |= BMCR_SPEED1000;
+                        val = BMCR_LOOPBACK | BMCR_FULLDPLX | BMCR_SPEED100;
+                } else
+                        val = BMCR_LOOPBACK | BMCR_FULLDPLX | BMCR_SPEED1000;
 
                 tg3_writephy(tp, MII_BMCR, val);
                 udelay(40);
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
+
+                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                           MAC_MODE_LINK_POLARITY;
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
                         tg3_writephy(tp, MII_TG3_EPHY_PTEST, 0x1800);
+                        mac_mode |= MAC_MODE_PORT_MODE_MII;
+                } else
+                        mac_mode |= MAC_MODE_PORT_MODE_GMII;
 
                 /* reset to prevent losing 1st rx packet intermittently */
                 if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) {
@@ -8799,12 +8816,6 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                         udelay(10);
                         tw32_f(MAC_RX_MODE, tp->rx_mode);
                 }
-                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
-                           MAC_MODE_LINK_POLARITY;
-                if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
-                        mac_mode |= MAC_MODE_PORT_MODE_MII;
-                else
-                        mac_mode |= MAC_MODE_PORT_MODE_GMII;
                 if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
                         mac_mode &= ~MAC_MODE_LINK_POLARITY;
                         tg3_writephy(tp, MII_TG3_EXT_CTRL,
@@ -9456,16 +9467,12 @@ static void __devinit tg3_get_5906_nvram_info(struct tg3 *tp)
 /* Chips other than 5700/5701 use the NVRAM for fetching info. */
 static void __devinit tg3_nvram_init(struct tg3 *tp)
 {
-        int j;
-
         tw32_f(GRC_EEPROM_ADDR,
              (EEPROM_ADDR_FSM_RESET |
               (EEPROM_DEFAULT_CLOCK_PERIOD <<
                EEPROM_ADDR_CLKPERD_SHIFT)));
 
-        /* XXX schedule_timeout() ... */
-        for (j = 0; j < 100; j++)
-                udelay(10);
+        msleep(1);
 
         /* Enable seeprom accesses. */
         tw32_f(GRC_LOCAL_CTRL,
@@ -9526,12 +9533,12 @@ static int tg3_nvram_read_using_eeprom(struct tg3 *tp,
               EEPROM_ADDR_ADDR_MASK) |
              EEPROM_ADDR_READ | EEPROM_ADDR_START);
 
-        for (i = 0; i < 10000; i++) {
+        for (i = 0; i < 1000; i++) {
                 tmp = tr32(GRC_EEPROM_ADDR);
 
                 if (tmp & EEPROM_ADDR_COMPLETE)
                         break;
-                udelay(100);
+                msleep(1);
         }
         if (!(tmp & EEPROM_ADDR_COMPLETE))
                 return -EBUSY;
@@ -9656,12 +9663,12 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp,
                         EEPROM_ADDR_START |
                         EEPROM_ADDR_WRITE);
 
-                for (j = 0; j < 10000; j++) {
+                for (j = 0; j < 1000; j++) {
                         val = tr32(GRC_EEPROM_ADDR);
 
                         if (val & EEPROM_ADDR_COMPLETE)
                                 break;
-                        udelay(100);
+                        msleep(1);
                 }
                 if (!(val & EEPROM_ADDR_COMPLETE)) {
                         rc = -EBUSY;
@@ -9965,8 +9972,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
         tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
-                if (!(tr32(PCIE_TRANSACTION_CFG) & PCIE_TRANS_CFG_LOM))
+                if (!(tr32(PCIE_TRANSACTION_CFG) & PCIE_TRANS_CFG_LOM)) {
                         tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
+                        tp->tg3_flags2 |= TG3_FLG2_IS_NIC;
+                }
                 return;
         }
 
@@ -10066,10 +10075,17 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                     tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
                         tp->led_ctrl = LED_CTRL_MODE_PHY_2;
 
-                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP)
+                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP) {
                         tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
-                else
+                        if ((tp->pdev->subsystem_vendor ==
+                             PCI_VENDOR_ID_ARIMA) &&
+                            (tp->pdev->subsystem_device == 0x205a ||
+                             tp->pdev->subsystem_device == 0x2063))
+                                tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
+                } else {
                         tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
+                        tp->tg3_flags2 |= TG3_FLG2_IS_NIC;
+                }
 
                 if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
                         tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
@@ -10147,7 +10163,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
 
         if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) &&
             !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
-                u32 bmsr, adv_reg, tg3_ctrl;
+                u32 bmsr, adv_reg, tg3_ctrl, mask;
 
                 tg3_readphy(tp, MII_BMSR, &bmsr);
                 if (!tg3_readphy(tp, MII_BMSR, &bmsr) &&
@@ -10171,7 +10187,10 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                                              MII_TG3_CTRL_ENABLE_AS_MASTER);
                 }
 
-                if (!tg3_copper_is_advertising_all(tp)) {
+                mask = (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
+                        ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
+                        ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full);
+                if (!tg3_copper_is_advertising_all(tp, mask)) {
                         tg3_writephy(tp, MII_ADVERTISE, adv_reg);
 
                         if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
@@ -10695,7 +10714,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
 
         /* Get eeprom hw config before calling tg3_set_power_state().
-         * In particular, the TG3_FLAG_EEPROM_WRITE_PROT flag must be
+         * In particular, the TG3_FLG2_IS_NIC flag must be
          * determined before calling tg3_set_power_state() so that
          * we know whether or not to switch out of Vaux power.
          * When the flag is set, it means that GPIO1 is used for eeprom
@@ -10862,7 +10881,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
               tp->pdev->device == PCI_DEVICE_ID_TIGON3_5705F)) ||
             (tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM &&
              (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5751F ||
-              tp->pdev->device == PCI_DEVICE_ID_TIGON3_5753F)) ||
+              tp->pdev->device == PCI_DEVICE_ID_TIGON3_5753F ||
+              tp->pdev->device == PCI_DEVICE_ID_TIGON3_5787F)) ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
 
@@ -11912,13 +11932,15 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 
         pci_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %sBaseT Ethernet ",
+        printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ",
                dev->name,
                tp->board_part_number,
                tp->pci_chip_rev_id,
                tg3_phy_string(tp),
                tg3_bus_string(tp, str),
-               (tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100" : "10/100/1000");
+               ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" :
+                ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" :
+                 "10/100/1000Base-T")));
 
         for (i = 0; i < 6; i++)
                 printk("%2.2x%c", dev->dev_addr[i],
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 92f53000bce..dfaf4ed127b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2233,6 +2233,7 @@ struct tg3 {
 #define TG3_FLG2_PCI_EXPRESS            0x00000200
 #define TG3_FLG2_ASF_NEW_HANDSHAKE      0x00000400
 #define TG3_FLG2_HW_AUTONEG             0x00000800
+#define TG3_FLG2_IS_NIC                 0x00001000
 #define TG3_FLG2_PHY_SERDES             0x00002000
 #define TG3_FLG2_CAPACITIVE_COUPLING    0x00004000
 #define TG3_FLG2_FLASH                  0x00008000