3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f234ba3f0404..7d170cd381c3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -920,8 +920,7 @@ config ENC28J60
        ---help---
          Support for the Microchip EN28J60 ethernet chip.
-          To compile this driver as a module, choose M here and read
+          To compile this driver as a module, choose M here. The module will be
-          <file:Documentation/networking/net-modules.txt>.  The module will be
          called enc28j60.
 config ENC28J60_WRITEVERIFY
@@ -2041,8 +2040,7 @@ config IGB
         More specific information on configuring the driver is in
         <file:Documentation/networking/e1000.txt>.
-         To compile this driver as a module, choose M here and read
+         To compile this driver as a module, choose M here. The module
-         <file:Documentation/networking/net-modules.txt>.  The module
         will be called igb.
 source "drivers/net/ixp2000/Kconfig"
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 11b83dae00ac..e04bf9926441 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -262,8 +262,8 @@ static void tm_isr(struct scc_priv *priv);
 static int io[MAX_NUM_DEVS] __initdata = { 0, };
-/* Beware! hw[] is also used in cleanup_module(). */
+/* Beware! hw[] is also used in dmascc_exit(). */
-static struct scc_hardware hw[NUM_TYPES] __initdata_or_module = HARDWARE;
+static struct scc_hardware hw[NUM_TYPES] = HARDWARE;
 /* Global variables */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 46339f6bcd00..038c1ef94d2e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -529,9 +529,13 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
        if (ifr->ifr_flags & IFF_NO_PI)
                tun->flags |= TUN_NO_PI;
+        else
+                tun->flags &= ~TUN_NO_PI;
        if (ifr->ifr_flags & IFF_ONE_QUEUE)
                tun->flags |= TUN_ONE_QUEUE;
+        else
+                tun->flags &= ~TUN_ONE_QUEUE;
        file->private_data = tun;
        tun->attached = 1;