[IEEE80211]: Fix softmac lockdep reports.

[linux-2.6-omap-h63xx.git] / drivers / net / sb1250-mac.c

diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 53845ebb649f69b796468c2304728fbf29618847..6001ab47fba074e8a5ac703f916120e708c5a271 100644 (file)
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -241,7 +241,6 @@ struct sbmac_softc {
        struct napi_struct napi;
        spinlock_t sbm_lock;            /* spin lock */
        struct timer_list sbm_timer;            /* for monitoring MII */
-       struct net_device_stats sbm_stats;
        int sbm_devflags;                       /* current device flags */
 
        int          sbm_phy_oldbmsr;
@@ -317,7 +316,6 @@ static int sbmac_set_duplex(struct sbmac_softc *s,sbmac_duplex_t duplex,sbmac_fc
 static int sbmac_open(struct net_device *dev);
 static void sbmac_timer(unsigned long data);
 static void sbmac_tx_timeout (struct net_device *dev);
-static struct net_device_stats *sbmac_get_stats(struct net_device *dev);
 static void sbmac_set_rx_mode(struct net_device *dev);
 static int sbmac_mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static int sbmac_close(struct net_device *dev);
@@ -780,10 +778,8 @@ static void sbdma_initctx(sbmacdma_t *d,
         * And context table
         */
 
-       d->sbdma_ctxtable = (struct sk_buff **)
-               kmalloc(d->sbdma_maxdescr*sizeof(struct sk_buff *), GFP_KERNEL);
-
-       memset(d->sbdma_ctxtable,0,d->sbdma_maxdescr*sizeof(struct sk_buff *));
+       d->sbdma_ctxtable = kcalloc(d->sbdma_maxdescr,
+                                   sizeof(struct sk_buff *), GFP_KERNEL);
 
 #ifdef CONFIG_SBMAC_COALESCE
        /*
@@ -1192,6 +1188,7 @@ static void sbmac_netpoll(struct net_device *netdev)
 static int sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d,
                              int work_to_do, int poll)
 {
+       struct net_device *dev = sc->sbm_dev;
        int curidx;
        int hwidx;
        sbdmadscr_t *dsc;
@@ -1204,7 +1201,7 @@ static int sbdma_rx_process(struct sbmac_softc *sc,sbmacdma_t *d,
 
 again:
        /* Check if the HW dropped any frames */
-       sc->sbm_stats.rx_fifo_errors
+       dev->stats.rx_fifo_errors
            += __raw_readq(sc->sbm_rxdma.sbdma_oodpktlost) & 0xffff;
        __raw_writeq(0, sc->sbm_rxdma.sbdma_oodpktlost);
 
@@ -1263,7 +1260,7 @@ again:
 
                        if (unlikely (sbdma_add_rcvbuffer(d,NULL) ==
                                      -ENOBUFS)) {
-                               sc->sbm_stats.rx_dropped++;
+                               dev->stats.rx_dropped++;
                                sbdma_add_rcvbuffer(d,sb); /* re-add old buffer */
                                /* No point in continuing at the moment */
                                printk(KERN_ERR "dropped packet (1)\n");
@@ -1299,13 +1296,13 @@ again:
                                        dropped = netif_rx(sb);
 
                                if (dropped == NET_RX_DROP) {
-                                       sc->sbm_stats.rx_dropped++;
+                                       dev->stats.rx_dropped++;
                                        d->sbdma_remptr = SBDMA_NEXTBUF(d,sbdma_remptr);
                                        goto done;
                                }
                                else {
-                                       sc->sbm_stats.rx_bytes += len;
-                                       sc->sbm_stats.rx_packets++;
+                                       dev->stats.rx_bytes += len;
+                                       dev->stats.rx_packets++;
                                }
                        }
                } else {
@@ -1313,7 +1310,7 @@ again:
                         * Packet was mangled somehow.  Just drop it and
                         * put it back on the receive ring.
                         */
-                       sc->sbm_stats.rx_errors++;
+                       dev->stats.rx_errors++;
                        sbdma_add_rcvbuffer(d,sb);
                }
 
@@ -1353,6 +1350,7 @@ done:
 
 static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d, int poll)
 {
+       struct net_device *dev = sc->sbm_dev;
        int curidx;
        int hwidx;
        sbdmadscr_t *dsc;
@@ -1403,8 +1401,8 @@ static void sbdma_tx_process(struct sbmac_softc *sc,sbmacdma_t *d, int poll)
                 * Stats
                 */
 
-               sc->sbm_stats.tx_bytes += sb->len;
-               sc->sbm_stats.tx_packets++;
+               dev->stats.tx_bytes += sb->len;
+               dev->stats.tx_packets++;
 
                /*
                 * for transmits, we just free buffers.
@@ -2409,6 +2407,7 @@ static int sbmac_init(struct net_device *dev, int idx)
        uint64_t ea_reg;
        int i;
        int err;
+       DECLARE_MAC_BUF(mac);
 
        sc = netdev_priv(dev);
 
@@ -2459,7 +2458,6 @@ static int sbmac_init(struct net_device *dev, int idx)
        dev->open               = sbmac_open;
        dev->hard_start_xmit    = sbmac_start_tx;
        dev->stop               = sbmac_close;
-       dev->get_stats          = sbmac_get_stats;
        dev->set_multicast_list = sbmac_set_rx_mode;
        dev->do_ioctl           = sbmac_mii_ioctl;
        dev->tx_timeout         = sbmac_tx_timeout;
@@ -2490,10 +2488,8 @@ static int sbmac_init(struct net_device *dev, int idx)
         * was being displayed)
         */
        printk(KERN_INFO
-              "%s: SiByte Ethernet at 0x%08lX, address: %02X:%02X:%02X:%02X:%02X:%02X\n",
-              dev->name, dev->base_addr,
-              eaddr[0],eaddr[1],eaddr[2],eaddr[3],eaddr[4],eaddr[5]);
-
+              "%s: SiByte Ethernet at 0x%08lX, address: %s\n",
+              dev->name, dev->base_addr, print_mac(mac, eaddr));
 
        return 0;
 
@@ -2750,7 +2746,7 @@ static void sbmac_tx_timeout (struct net_device *dev)
 
 
        dev->trans_start = jiffies;
-       sc->sbm_stats.tx_errors++;
+       dev->stats.tx_errors++;
 
        spin_unlock_irq (&sc->sbm_lock);
 
@@ -2760,22 +2756,6 @@ static void sbmac_tx_timeout (struct net_device *dev)
 
 
 
-static struct net_device_stats *sbmac_get_stats(struct net_device *dev)
-{
-       struct sbmac_softc *sc = netdev_priv(dev);
-       unsigned long flags;
-
-       spin_lock_irqsave(&sc->sbm_lock, flags);
-
-       /* XXX update other stats here */
-
-       spin_unlock_irqrestore(&sc->sbm_lock, flags);
-
-       return &sc->sbm_stats;
-}
-
-
-
 static void sbmac_set_rx_mode(struct net_device *dev)
 {
        unsigned long flags;