Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
  sk98lin: planned removal
  AT91: MACB support
  sky2: version 1.12
  sky2: add new chip ids
  sky2: Yukon Extreme support
  sky2: safer transmit timeout
  sky2: TSO support for EC_U
  sky2: use dev_err for error reports
  sky2: add Wake On Lan support
  fix unaligned exception in /drivers/net/wireless/orinoco.c
  Remove unused kernel config option DLCI_COUNT
  z85230: spinlock logic
  mips: declance: Driver model for the PMAD-A
  Spidernet: Rework RX linked list
  NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
  NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
  hp100: convert pci_module_init() to pci_register_driver()
  NetXen: Added ethtool support for user level tools.
  NetXen: Firmware crb init changes.
  maintainers: add atl1 maintainers
  ...

1 files changed, 30 insertions, 32 deletions

diff --git a/drivers/net/chelsio/tp.c b/drivers/net/chelsio/tp.c
index 0ca0b6e19e43..6222d585e447 100644
--- a/drivers/net/chelsio/tp.c
+++ b/drivers/net/chelsio/tp.c
@@ -17,39 +17,36 @@ struct petp {
 static void tp_init(adapter_t * ap, const struct tp_params *p,
                     unsigned int tp_clk)
 {
-        if (t1_is_asic(ap)) {
-                u32 val;
-
-                val = F_TP_IN_CSPI_CPL | F_TP_IN_CSPI_CHECK_IP_CSUM |
-                    F_TP_IN_CSPI_CHECK_TCP_CSUM | F_TP_IN_ESPI_ETHERNET;
-                if (!p->pm_size)
-                        val |= F_OFFLOAD_DISABLE;
-                else
-                        val |= F_TP_IN_ESPI_CHECK_IP_CSUM |
-                            F_TP_IN_ESPI_CHECK_TCP_CSUM;
-                writel(val, ap->regs + A_TP_IN_CONFIG);
-                writel(F_TP_OUT_CSPI_CPL |
-                       F_TP_OUT_ESPI_ETHERNET |
-                       F_TP_OUT_ESPI_GENERATE_IP_CSUM |
-                       F_TP_OUT_ESPI_GENERATE_TCP_CSUM,
-                       ap->regs + A_TP_OUT_CONFIG);
-                writel(V_IP_TTL(64) |
-                       F_PATH_MTU /* IP DF bit */  |
-                       V_5TUPLE_LOOKUP(p->use_5tuple_mode) |
-                       V_SYN_COOKIE_PARAMETER(29),
-                       ap->regs + A_TP_GLOBAL_CONFIG);
-                /*
-                 * Enable pause frame deadlock prevention.
-                 */
-                if (is_T2(ap) && ap->params.nports > 1) {
-                        u32 drop_ticks = DROP_MSEC * (tp_clk / 1000);
-
-                        writel(F_ENABLE_TX_DROP | F_ENABLE_TX_ERROR |
-                               V_DROP_TICKS_CNT(drop_ticks) |
-                               V_NUM_PKTS_DROPPED(DROP_PKTS_CNT),
-                               ap->regs + A_TP_TX_DROP_CONFIG);
-                }
+        u32 val;
 
+        if (!t1_is_asic(ap))
+                return;
+
+        val = F_TP_IN_CSPI_CPL | F_TP_IN_CSPI_CHECK_IP_CSUM |
+                F_TP_IN_CSPI_CHECK_TCP_CSUM | F_TP_IN_ESPI_ETHERNET;
+        if (!p->pm_size)
+                val |= F_OFFLOAD_DISABLE;
+        else
+                val |= F_TP_IN_ESPI_CHECK_IP_CSUM | F_TP_IN_ESPI_CHECK_TCP_CSUM;
+        writel(val, ap->regs + A_TP_IN_CONFIG);
+        writel(F_TP_OUT_CSPI_CPL |
+               F_TP_OUT_ESPI_ETHERNET |
+               F_TP_OUT_ESPI_GENERATE_IP_CSUM |
+               F_TP_OUT_ESPI_GENERATE_TCP_CSUM, ap->regs + A_TP_OUT_CONFIG);
+        writel(V_IP_TTL(64) |
+               F_PATH_MTU /* IP DF bit */  |
+               V_5TUPLE_LOOKUP(p->use_5tuple_mode) |
+               V_SYN_COOKIE_PARAMETER(29), ap->regs + A_TP_GLOBAL_CONFIG);
+        /*
+         * Enable pause frame deadlock prevention.
+         */
+        if (is_T2(ap) && ap->params.nports > 1) {
+                u32 drop_ticks = DROP_MSEC * (tp_clk / 1000);
+
+                writel(F_ENABLE_TX_DROP | F_ENABLE_TX_ERROR |
+                       V_DROP_TICKS_CNT(drop_ticks) |
+                       V_NUM_PKTS_DROPPED(DROP_PKTS_CNT),
+                       ap->regs + A_TP_TX_DROP_CONFIG);
         }
 }
 
@@ -61,6 +58,7 @@ void t1_tp_destroy(struct petp *tp)
 struct petp *__devinit t1_tp_create(adapter_t * adapter, struct tp_params *p)
 {
         struct petp *tp = kzalloc(sizeof(*tp), GFP_KERNEL);
+
         if (!tp)
                 return NULL;