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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (77 commits)
  [IPV6]: Reorg struct ifmcaddr6 to save some bytes
  [INET_TIMEWAIT_SOCK]: Reorganize struct inet_timewait_sock to save some bytes
  [DCCP]: Reorganize struct dccp_sock to save 8 bytes
  [INET6]: Reorganize struct inet6_dev to save 8 bytes
  [SOCK] proto: Add hashinfo member to struct proto
  EMAC driver: Fix bug: The clock divisor is set to all ones at reset.
  EMAC driver: fix bug - invalidate data cache of new_skb->data range when cache is WB
  EMAC driver: add power down mode
  EMAC driver: ADSP-BF52x arch/mach support
  EMAC driver: use simpler comment headers and strip out information that is maintained in the scm's log
  EMAC driver: bf537 MAC multicast hash filtering patch
  EMAC driver: define MDC_CLK=2.5MHz and caculate mdc_div according to SCLK.
  EMAC driver: shorten the mdelay value to solve netperf performance issue
  [netdrvr] sis190: build fix
  sky2: fix Wake On Lan interaction with BIOS
  sky2: restore multicast addresses after recovery
  pci-skeleton: Misc fixes to build neatly
  phylib: Add Realtek 821x eth PHY support
  natsemi: Update locking documentation
  PHYLIB: Locking fixes for PHY I/O potentially sleeping
  ...

1 files changed, 30 insertions, 7 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 4ffd8739f8b7..fba0811d2608 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -2084,8 +2084,10 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
         if (!ugeth)
                 return;
 
-        if (ugeth->uccf)
+        if (ugeth->uccf) {
                 ucc_fast_free(ugeth->uccf);
+                ugeth->uccf = NULL;
+        }
 
         if (ugeth->p_thread_data_tx) {
                 qe_muram_free(ugeth->thread_dat_tx_offset);
@@ -2305,10 +2307,6 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         ug_info = ugeth->ug_info;
         uf_info = &ug_info->uf_info;
 
-        /* Create CQs for hash tables */
-        INIT_LIST_HEAD(&ugeth->group_hash_q);
-        INIT_LIST_HEAD(&ugeth->ind_hash_q);
-
         if (!((uf_info->bd_mem_part == MEM_PART_SYSTEM) ||
               (uf_info->bd_mem_part == MEM_PART_MURAM))) {
                 if (netif_msg_probe(ugeth))
@@ -3668,6 +3666,23 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
         return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void ucc_netpoll(struct net_device *dev)
+{
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+        int irq = ugeth->ug_info->uf_info.irq;
+
+        disable_irq(irq);
+        ucc_geth_irq_handler(irq, dev);
+        enable_irq(irq);
+}
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+
 /* Called when something needs to use the ethernet device */
 /* Returns 0 for success. */
 static int ucc_geth_open(struct net_device *dev)
@@ -3990,6 +4005,10 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         ugeth = netdev_priv(dev);
         spin_lock_init(&ugeth->lock);
 
+        /* Create CQs for hash tables */
+        INIT_LIST_HEAD(&ugeth->group_hash_q);
+        INIT_LIST_HEAD(&ugeth->ind_hash_q);
+
         dev_set_drvdata(device, dev);
 
         /* Set the dev->base_addr to the gfar reg region */
@@ -4006,6 +4025,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 #ifdef CONFIG_UGETH_NAPI
         netif_napi_add(dev, &ugeth->napi, ucc_geth_poll, UCC_GETH_DEV_WEIGHT);
 #endif                          /* CONFIG_UGETH_NAPI */
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = ucc_netpoll;
+#endif
         dev->stop = ucc_geth_close;
 //    dev->change_mtu = ucc_geth_change_mtu;
         dev->mtu = 1500;
@@ -4040,9 +4062,10 @@ static int ucc_geth_remove(struct of_device* ofdev)
         struct net_device *dev = dev_get_drvdata(device);
         struct ucc_geth_private *ugeth = netdev_priv(dev);
 
-        dev_set_drvdata(device, NULL);
-        ucc_geth_memclean(ugeth);
+        unregister_netdev(dev);
         free_netdev(dev);
+        ucc_geth_memclean(ugeth);
+        dev_set_drvdata(device, NULL);
 
         return 0;
 }