[PATCH] hostap: Allocate enough tailroom for TKIP

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

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index c15e97253ede41611153c4fdbd12b3376165f631..ef84d7c757a080d8f26b3d2576f3d90a490b7052 100644 (file)
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -175,12 +175,10 @@ spider_net_setup_aneg(struct spider_net_card *card)
 {
        struct mii_phy *phy = &card->phy;
        u32 advertise = 0;
-       u16 bmcr, bmsr, stat1000, estat;
+       u16 bmsr, estat;
 
-       bmcr     = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMCR);
-       bmsr     = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR);
-       stat1000 = spider_net_read_phy(card->netdev, phy->mii_id, MII_STAT1000);
-       estat    = spider_net_read_phy(card->netdev, phy->mii_id, MII_ESTATUS);
+       bmsr  = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR);
+       estat = spider_net_read_phy(card->netdev, phy->mii_id, MII_ESTATUS);
 
        if (bmsr & BMSR_10HALF)
                advertise |= ADVERTISED_10baseT_Half;
@@ -432,7 +430,8 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
        /* and we need to have it 128 byte aligned, therefore we allocate a
         * bit more */
        /* allocate an skb */
-       descr->skb = dev_alloc_skb(bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
+       descr->skb = netdev_alloc_skb(card->netdev,
+                                     bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
        if (!descr->skb) {
                if (netif_msg_rx_err(card) && net_ratelimit())
                        pr_err("Not enough memory to allocate rx buffer\n");
@@ -1015,12 +1014,12 @@ spider_net_pass_skb_up(struct spider_net_descr *descr,
                 */
        }
 
-       /* pass skb up to stack */
-       netif_receive_skb(skb);
-
        /* update netdevice statistics */
        card->netdev_stats.rx_packets++;
        card->netdev_stats.rx_bytes += skb->len;
+
+       /* pass skb up to stack */
+       netif_receive_skb(skb);
 }
 
 #ifdef DEBUG