Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

20 files changed, 96 insertions, 94 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a0f0e605d630..fe7b5ec09708 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2366,15 +2366,15 @@ config GELIC_NET
           module will be called ps3_gelic.
 
 config GELIC_WIRELESS
-       bool "PS3 Wireless support"
-       depends on GELIC_NET
-       select WIRELESS_EXT
-       help
-        This option adds the support for the wireless feature of PS3.
-        If you have the wireless-less model of PS3 or have no plan to
-        use wireless feature, disabling this option saves memory.  As
-        the driver automatically distinguishes the models, you can
-        safely enable this option even if you have a wireless-less model.
+        bool "PS3 Wireless support"
+        depends on GELIC_NET
+        select WIRELESS_EXT
+        help
+          This option adds the support for the wireless feature of PS3.
+          If you have the wireless-less model of PS3 or have no plan to
+          use wireless feature, disabling this option saves memory.  As
+          the driver automatically distinguishes the models, you can
+          safely enable this option even if you have a wireless-less model.
 
 config GIANFAR
         tristate "Gianfar Ethernet"
@@ -2519,7 +2519,7 @@ config CHELSIO_T3
 
 config EHEA
         tristate "eHEA Ethernet support"
-        depends on IBMEBUS && INET
+        depends on IBMEBUS && INET && SPARSEMEM
         select INET_LRO
         ---help---
           This driver supports the IBM pSeries eHEA ethernet adapter.
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 5136d94923aa..b1448637107f 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -369,7 +369,7 @@ MODULE_PARM_DESC(mem, "Memory base address(es)");
 MODULE_DESCRIPTION("Ansel AC3200 EISA ethernet driver");
 MODULE_LICENSE("GPL");
 
-int __init init_module(void)
+static int __init ac3200_module_init(void)
 {
         struct net_device *dev;
         int this_dev, found = 0;
@@ -404,8 +404,7 @@ static void cleanup_card(struct net_device *dev)
         iounmap(ei_status.mem);
 }
 
-void __exit
-cleanup_module(void)
+static void __exit ac3200_module_exit(void)
 {
         int this_dev;
 
@@ -418,4 +417,6 @@ cleanup_module(void)
                 }
         }
 }
+module_init(ac3200_module_init);
+module_exit(ac3200_module_exit);
 #endif /* MODULE */
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index c12cbdf368b1..47a8275d3962 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -569,7 +569,7 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)
 #ifdef MODULE
 static struct net_device *apne_dev;
 
-int __init init_module(void)
+static int __init apne_module_init(void)
 {
         apne_dev = apne_probe(-1);
         if (IS_ERR(apne_dev))
@@ -577,7 +577,7 @@ int __init init_module(void)
         return 0;
 }
 
-void __exit cleanup_module(void)
+static void __exit apne_module_exit(void)
 {
         unregister_netdev(apne_dev);
 
@@ -591,7 +591,8 @@ void __exit cleanup_module(void)
 
         free_netdev(apne_dev);
 }
-
+module_init(apne_module_init);
+module_exit(apne_module_exit);
 #endif
 
 static int init_pcmcia(void)
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6ab2c2d4d673..fef5560bc7a2 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1252,7 +1252,7 @@ module_param(irq, int, 0);
 module_param(dma, int, 0);
 
 
-int __init init_module(void)
+static int __init ltpc_module_init(void)
 {
         if(io == 0)
                 printk(KERN_NOTICE
@@ -1263,6 +1263,7 @@ int __init init_module(void)
                 return PTR_ERR(dev_ltpc);
         return 0;
 }
+module_init(ltpc_module_init);
 #endif
 
 static void __exit ltpc_cleanup(void)
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index cc4610db6395..02cb8f1c1148 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -80,17 +80,19 @@ void arcnet_cap_init(void)
 
 #ifdef MODULE
 
-int __init init_module(void)
+static int __init capmode_module_init(void)
 {
         printk(VERSION);
         arcnet_cap_init();
         return 0;
 }
 
-void cleanup_module(void)
+static void __exit capmode_module_exit(void)
 {
         arcnet_unregister_proto(&capmode_proto);
 }
+module_init(capmode_module_init);
+module_exit(capmode_module_exit);
 
 MODULE_LICENSE("GPL");
 #endif                          /* MODULE */
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index b74dbeef8050..13c293b286de 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -336,8 +336,6 @@ struct lance_addr {
 
 /***************************** Prototypes *****************************/
 
-static int addr_accessible( volatile void *regp, int wordflag, int
-                            writeflag );
 static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
                                    *init_rec );
 static int lance_open( struct net_device *dev );
@@ -406,7 +404,8 @@ struct net_device * __init atarilance_probe(int unit)
 
 /* Derived from hwreg_present() in atari/config.c: */
 
-static int __init addr_accessible( volatile void *regp, int wordflag, int writeflag )
+static noinline int __init addr_accessible(volatile void *regp, int wordflag,
+                                           int writeflag)
 {
         int             ret;
         long    flags;
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 36ba6dc96acc..cdf3090a1885 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev)
         }
 }
 
-#ifdef CONFIG_PM
 static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct nic *nic = netdev_priv(netdev);
 
         if (netif_running(netdev))
-                napi_disable(&nic->napi);
-        del_timer_sync(&nic->watchdog);
-        netif_carrier_off(nic->netdev);
+                e100_down(nic);
         netif_device_detach(netdev);
 
         pci_save_state(pdev);
@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
                 pci_enable_wake(pdev, PCI_D3cold, 0);
         }
 
-        free_irq(pdev->irq, netdev);
-
         pci_disable_device(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
 }
 
+#ifdef CONFIG_PM
 static int e100_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev)
 
 static void e100_shutdown(struct pci_dev *pdev)
 {
-        struct net_device *netdev = pci_get_drvdata(pdev);
-        struct nic *nic = netdev_priv(netdev);
-
-        if (netif_running(netdev))
-                napi_disable(&nic->napi);
-        del_timer_sync(&nic->watchdog);
-        netif_carrier_off(nic->netdev);
-
-        if ((nic->flags & wol_magic) | e100_asf(nic)) {
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-                pci_enable_wake(pdev, PCI_D3cold, 1);
-        } else {
-                pci_enable_wake(pdev, PCI_D3hot, 0);
-                pci_enable_wake(pdev, PCI_D3cold, 0);
-        }
-
-        free_irq(pdev->irq, netdev);
-
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
+        e100_suspend(pdev, PMSG_SUSPEND);
 }
 
 /* ------------------ PCI Error Recovery infrastructure  -------------- */
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 0809a6a5a286..46a90e9ec563 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -900,7 +900,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                 if (RSV_GETBIT(rxstat, RSV_LENCHECKERR))
                         ndev->stats.rx_frame_errors++;
         } else {
-                skb = dev_alloc_skb(len);
+                skb = dev_alloc_skb(len + NET_IP_ALIGN);
                 if (!skb) {
                         if (netif_msg_rx_err(priv))
                                 dev_err(&ndev->dev,
@@ -908,6 +908,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                         ndev->stats.rx_dropped++;
                 } else {
                         skb->dev = ndev;
+                        skb_reserve(skb, NET_IP_ALIGN);
                         /* copy the packet from the receive buffer */
                         enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),
                                         len, skb_put(skb, len));
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 23d0a4afe0e1..c2095ce531c9 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2133,7 +2133,7 @@ static void ixgbe_watchdog(unsigned long data)
                                 (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
                                  "10 Gbps" :
                                  (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                                  "1 Gpbs" : "unknown speed")),
+                                  "1 Gbps" : "unknown speed")),
                                 ((FLOW_RX && FLOW_TX) ? "RX/TX" :
                                  (FLOW_RX ? "RX" :
                                  (FLOW_TX ? "TX" : "None"))));
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b528ce77c406..771139e283af 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2104,6 +2104,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR(  "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
                 " and Dale Farnsworth");
 MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+MODULE_ALIAS("platform:mv643xx_eth");
 
 /*
  * The second part is the low level driver of the gigE ethernet ports.
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index e8a63e483a2b..ce95c5d168fe 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1268,7 +1268,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
                 }
         }
     
-        if (interrupts && ei_debug) 
+        if (interrupts && ei_debug > 3) 
         {
                 handled = 1;
                 if (nr_serviced >= MAX_SERVICE) 
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index f4ca0591231d..3ac8529bb92c 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -67,6 +67,7 @@ config REALTEK_PHY
 
 config FIXED_PHY
         bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+        depends on PHYLIB=y
         ---help---
           Adds the platform "fixed" MDIO Bus to cover the boards that use
           PHYs that are not connected to the real MDIO bus.
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 7ed632db00d7..d926168bc780 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -37,6 +37,7 @@
 
 #define MII_DM9161_SCR          0x10
 #define MII_DM9161_SCR_INIT     0x0610
+#define MII_DM9161_SCR_RMII     0x0100
 
 /* DM9161 Interrupt Register */
 #define MII_DM9161_INTR 0x15
@@ -103,7 +104,7 @@ static int dm9161_config_aneg(struct phy_device *phydev)
 
 static int dm9161_config_init(struct phy_device *phydev)
 {
-        int err;
+        int err, temp;
 
         /* Isolate the PHY */
         err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
@@ -111,9 +112,19 @@ static int dm9161_config_init(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        /* Do not bypass the scrambler/descrambler */
-        err = phy_write(phydev, MII_DM9161_SCR, MII_DM9161_SCR_INIT);
+        switch (phydev->interface) {
+        case PHY_INTERFACE_MODE_MII:
+                temp = MII_DM9161_SCR_INIT;
+                break;
+        case PHY_INTERFACE_MODE_RMII:
+                temp =  MII_DM9161_SCR_INIT | MII_DM9161_SCR_RMII;
+                break;
+        default:
+                return -EINVAL;
+        }
 
+        /* Do not bypass the scrambler/descrambler */
+        err = phy_write(phydev, MII_DM9161_SCR, temp);
         if (err < 0)
                 return err;
 
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 86e5dba079fe..3d10ca050b79 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -302,14 +302,14 @@ pppol2tp_session_find(struct pppol2tp_tunnel *tunnel, u16 session_id)
         struct pppol2tp_session *session;
         struct hlist_node *walk;
 
-        read_lock(&tunnel->hlist_lock);
+        read_lock_bh(&tunnel->hlist_lock);
         hlist_for_each_entry(session, walk, session_list, hlist) {
                 if (session->tunnel_addr.s_session == session_id) {
-                        read_unlock(&tunnel->hlist_lock);
+                        read_unlock_bh(&tunnel->hlist_lock);
                         return session;
                 }
         }
-        read_unlock(&tunnel->hlist_lock);
+        read_unlock_bh(&tunnel->hlist_lock);
 
         return NULL;
 }
@@ -320,14 +320,14 @@ static struct pppol2tp_tunnel *pppol2tp_tunnel_find(u16 tunnel_id)
 {
         struct pppol2tp_tunnel *tunnel = NULL;
 
-        read_lock(&pppol2tp_tunnel_list_lock);
+        read_lock_bh(&pppol2tp_tunnel_list_lock);
         list_for_each_entry(tunnel, &pppol2tp_tunnel_list, list) {
                 if (tunnel->stats.tunnel_id == tunnel_id) {
-                        read_unlock(&pppol2tp_tunnel_list_lock);
+                        read_unlock_bh(&pppol2tp_tunnel_list_lock);
                         return tunnel;
                 }
         }
-        read_unlock(&pppol2tp_tunnel_list_lock);
+        read_unlock_bh(&pppol2tp_tunnel_list_lock);
 
         return NULL;
 }
@@ -342,10 +342,11 @@ static struct pppol2tp_tunnel *pppol2tp_tunnel_find(u16 tunnel_id)
 static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_buff *skb)
 {
         struct sk_buff *skbp;
+        struct sk_buff *tmp;
         u16 ns = PPPOL2TP_SKB_CB(skb)->ns;
 
-        spin_lock(&session->reorder_q.lock);
-        skb_queue_walk(&session->reorder_q, skbp) {
+        spin_lock_bh(&session->reorder_q.lock);
+        skb_queue_walk_safe(&session->reorder_q, skbp, tmp) {
                 if (PPPOL2TP_SKB_CB(skbp)->ns > ns) {
                         __skb_insert(skb, skbp->prev, skbp, &session->reorder_q);
                         PRINTK(session->debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG,
@@ -360,7 +361,7 @@ static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_
         __skb_queue_tail(&session->reorder_q, skb);
 
 out:
-        spin_unlock(&session->reorder_q.lock);
+        spin_unlock_bh(&session->reorder_q.lock);
 }
 
 /* Dequeue a single skb.
@@ -371,10 +372,9 @@ static void pppol2tp_recv_dequeue_skb(struct pppol2tp_session *session, struct s
         int length = PPPOL2TP_SKB_CB(skb)->length;
         struct sock *session_sock = NULL;
 
-        /* We're about to requeue the skb, so unlink it and return resources
+        /* We're about to requeue the skb, so return resources
          * to its current owner (a socket receive buffer).
          */
-        skb_unlink(skb, &session->reorder_q);
         skb_orphan(skb);
 
         tunnel->stats.rx_packets++;
@@ -442,7 +442,7 @@ static void pppol2tp_recv_dequeue(struct pppol2tp_session *session)
          * expect to send up next, dequeue it and any other
          * in-sequence packets behind it.
          */
-        spin_lock(&session->reorder_q.lock);
+        spin_lock_bh(&session->reorder_q.lock);
         skb_queue_walk_safe(&session->reorder_q, skb, tmp) {
                 if (time_after(jiffies, PPPOL2TP_SKB_CB(skb)->expires)) {
                         session->stats.rx_seq_discards++;
@@ -470,13 +470,18 @@ static void pppol2tp_recv_dequeue(struct pppol2tp_session *session)
                                 goto out;
                         }
                 }
-                spin_unlock(&session->reorder_q.lock);
+                __skb_unlink(skb, &session->reorder_q);
+
+                /* Process the skb. We release the queue lock while we
+                 * do so to let other contexts process the queue.
+                 */
+                spin_unlock_bh(&session->reorder_q.lock);
                 pppol2tp_recv_dequeue_skb(session, skb);
-                spin_lock(&session->reorder_q.lock);
+                spin_lock_bh(&session->reorder_q.lock);
         }
 
 out:
-        spin_unlock(&session->reorder_q.lock);
+        spin_unlock_bh(&session->reorder_q.lock);
 }
 
 /* Internal receive frame. Do the real work of receiving an L2TP data frame
@@ -1059,7 +1064,7 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 
         /* Get routing info from the tunnel socket */
         dst_release(skb->dst);
-        skb->dst = sk_dst_get(sk_tun);
+        skb->dst = dst_clone(__sk_dst_get(sk_tun));
         skb_orphan(skb);
         skb->sk = sk_tun;
 
@@ -1107,7 +1112,7 @@ static void pppol2tp_tunnel_closeall(struct pppol2tp_tunnel *tunnel)
         PRINTK(tunnel->debug, PPPOL2TP_MSG_CONTROL, KERN_INFO,
                "%s: closing all sessions...\n", tunnel->name);
 
-        write_lock(&tunnel->hlist_lock);
+        write_lock_bh(&tunnel->hlist_lock);
         for (hash = 0; hash < PPPOL2TP_HASH_SIZE; hash++) {
 again:
                 hlist_for_each_safe(walk, tmp, &tunnel->session_hlist[hash]) {
@@ -1129,7 +1134,7 @@ again:
                          * disappear as we're jumping between locks.
                          */
                         sock_hold(sk);
-                        write_unlock(&tunnel->hlist_lock);
+                        write_unlock_bh(&tunnel->hlist_lock);
                         lock_sock(sk);
 
                         if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
@@ -1154,11 +1159,11 @@ again:
                          * list so we are guaranteed to make forward
                          * progress.
                          */
-                        write_lock(&tunnel->hlist_lock);
+                        write_lock_bh(&tunnel->hlist_lock);
                         goto again;
                 }
         }
-        write_unlock(&tunnel->hlist_lock);
+        write_unlock_bh(&tunnel->hlist_lock);
 }
 
 /* Really kill the tunnel.
@@ -1167,9 +1172,9 @@ again:
 static void pppol2tp_tunnel_free(struct pppol2tp_tunnel *tunnel)
 {
         /* Remove from socket list */
-        write_lock(&pppol2tp_tunnel_list_lock);
+        write_lock_bh(&pppol2tp_tunnel_list_lock);
         list_del_init(&tunnel->list);
-        write_unlock(&pppol2tp_tunnel_list_lock);
+        write_unlock_bh(&pppol2tp_tunnel_list_lock);
 
         atomic_dec(&pppol2tp_tunnel_count);
         kfree(tunnel);
@@ -1245,9 +1250,9 @@ static void pppol2tp_session_destruct(struct sock *sk)
                                 /* Delete the session socket from the
                                  * hash
                                  */
-                                write_lock(&tunnel->hlist_lock);
+                                write_lock_bh(&tunnel->hlist_lock);
                                 hlist_del_init(&session->hlist);
-                                write_unlock(&tunnel->hlist_lock);
+                                write_unlock_bh(&tunnel->hlist_lock);
 
                                 atomic_dec(&pppol2tp_session_count);
                         }
@@ -1392,9 +1397,9 @@ static struct sock *pppol2tp_prepare_tunnel_socket(int fd, u16 tunnel_id,
 
         /* Add tunnel to our list */
         INIT_LIST_HEAD(&tunnel->list);
-        write_lock(&pppol2tp_tunnel_list_lock);
+        write_lock_bh(&pppol2tp_tunnel_list_lock);
         list_add(&tunnel->list, &pppol2tp_tunnel_list);
-        write_unlock(&pppol2tp_tunnel_list_lock);
+        write_unlock_bh(&pppol2tp_tunnel_list_lock);
         atomic_inc(&pppol2tp_tunnel_count);
 
         /* Bump the reference count. The tunnel context is deleted
@@ -1599,11 +1604,11 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
         sk->sk_user_data = session;
 
         /* Add session to the tunnel's hash list */
-        write_lock(&tunnel->hlist_lock);
+        write_lock_bh(&tunnel->hlist_lock);
         hlist_add_head(&session->hlist,
                        pppol2tp_session_id_hash(tunnel,
                                                 session->tunnel_addr.s_session));
-        write_unlock(&tunnel->hlist_lock);
+        write_unlock_bh(&tunnel->hlist_lock);
 
         atomic_inc(&pppol2tp_session_count);
 
@@ -2205,7 +2210,7 @@ static struct pppol2tp_session *next_session(struct pppol2tp_tunnel *tunnel, str
         int next = 0;
         int i;
 
-        read_lock(&tunnel->hlist_lock);
+        read_lock_bh(&tunnel->hlist_lock);
         for (i = 0; i < PPPOL2TP_HASH_SIZE; i++) {
                 hlist_for_each_entry(session, walk, &tunnel->session_hlist[i], hlist) {
                         if (curr == NULL) {
@@ -2223,7 +2228,7 @@ static struct pppol2tp_session *next_session(struct pppol2tp_tunnel *tunnel, str
                 }
         }
 out:
-        read_unlock(&tunnel->hlist_lock);
+        read_unlock_bh(&tunnel->hlist_lock);
         if (!found)
                 session = NULL;
 
@@ -2234,13 +2239,13 @@ static struct pppol2tp_tunnel *next_tunnel(struct pppol2tp_tunnel *curr)
 {
         struct pppol2tp_tunnel *tunnel = NULL;
 
-        read_lock(&pppol2tp_tunnel_list_lock);
+        read_lock_bh(&pppol2tp_tunnel_list_lock);
         if (list_is_last(&curr->list, &pppol2tp_tunnel_list)) {
                 goto out;
         }
         tunnel = list_entry(curr->list.next, struct pppol2tp_tunnel, list);
 out:
-        read_unlock(&pppol2tp_tunnel_list_lock);
+        read_unlock_bh(&pppol2tp_tunnel_list_lock);
 
         return tunnel;
 }
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 6179a0a2032c..c72787adeba3 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1088,7 +1088,7 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
  *  '-1' on failure
  */
 
-int init_tti(struct s2io_nic *nic, int link)
+static int init_tti(struct s2io_nic *nic, int link)
 {
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
         register u64 val64 = 0;
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 77d9dd7ea34f..567c62757e9d 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -910,7 +910,8 @@ static void de_set_media (struct de_private *de)
         unsigned media = de->media_type;
         u32 macmode = dr32(MacMode);
 
-        BUG_ON(de_is_running(de));
+        if (de_is_running(de))
+                printk(KERN_WARNING "%s: chip is running while changing media!\n", de->dev->name);
 
         if (de->de21040)
                 dw32(CSR11, FULL_DUPLEX_MAGIC);
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 15d5c58e57bc..e59255a155a9 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -751,7 +751,7 @@ upload_data( struct net_device  *dev,  unsigned  framelen,  unsigned  frameno,
 }
 
 
-static __inline void
+static inline void
 send_complete( struct net_local  *nl )
 {
 #ifdef CONFIG_SBNI_MULTILINE
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index bdc6a1cc2103..f0ef7081bdeb 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -578,7 +578,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                 goto done;
         }
         if (respcmd != CMD_RET(curcmd) &&
-            respcmd != CMD_802_11_ASSOCIATE && curcmd != CMD_RET_802_11_ASSOCIATE) {
+            respcmd != CMD_RET_802_11_ASSOCIATE && curcmd != CMD_802_11_ASSOCIATE) {
                 lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd);
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
                 ret = -1;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index e808db98f2f5..93ea212fedd5 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2302,9 +2302,9 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
          * Apply some rules to the filters:
          * - Some filters imply different filters to be set.
          * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
          */
-        if (mc_count)
-                *total_flags |= FIF_ALLMULTI;
+        *total_flags |= FIF_ALLMULTI;
         if (*total_flags & FIF_OTHER_BSS ||
             *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 4fac2d414d84..8103d41a1543 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1869,9 +1869,9 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw,
          * Apply some rules to the filters:
          * - Some filters imply different filters to be set.
          * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
          */
-        if (mc_count)
-                *total_flags |= FIF_ALLMULTI;
+        *total_flags |= FIF_ALLMULTI;
         if (*total_flags & FIF_OTHER_BSS ||
             *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
@@ -2098,6 +2098,7 @@ static struct usb_device_id rt73usb_device_table[] = {
         /* D-Link */
         { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) },
         { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) },
         /* Gemtek */
         { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) },
         /* Gigabyte */