6 files changed, 15 insertions, 8 deletions

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index fa108c46e851..8a8743d7d6e7 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -85,12 +85,13 @@ static inline int ebt_do_match (struct ebt_entry_match *m,
 static inline int ebt_dev_check(char *entry, const struct net_device *device)
 {
         int i = 0;
-        const char *devname = device->name;
+        const char *devname;
 
         if (*entry == '\0')
                 return 0;
         if (!device)
                 return 1;
+        devname = device->name;
         /* 1 is the wildcard token */
         while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])
                 i++;
diff --git a/net/core/dev.c b/net/core/dev.c
index 5f736f1ceeae..b715a55cccc4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1088,6 +1088,11 @@ int dev_open(struct net_device *dev)
                 dev->flags |= IFF_UP;
 
                 /*
+                 *      Enable NET_DMA
+                 */
+                dmaengine_get();
+
+                /*
                  *      Initialize multicasting status
                  */
                 dev_set_rx_mode(dev);
@@ -1164,6 +1169,11 @@ int dev_close(struct net_device *dev)
          */
         call_netdevice_notifiers(NETDEV_DOWN, dev);
 
+        /*
+         *      Shutdown NET_DMA
+         */
+        dmaengine_put();
+
         return 0;
 }
 
@@ -5151,9 +5161,6 @@ static int __init net_dev_init(void)
         hotcpu_notifier(dev_cpu_callback, 0);
         dst_init();
         dev_mcast_init();
-        #ifdef CONFIG_NET_DMA
-        dmaengine_get();
-        #endif
         rc = 0;
 out:
         return rc;
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index b28bf962edc3..4b5db44970aa 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -29,7 +29,7 @@ config IP_DCCP_CCID3
           http://www.ietf.org/rfc/rfc4342.txt
 
           The TFRC congestion control algorithms were initially described in
-          RFC 5448.
+          RFC 5348.
 
           This text was extracted from RFC 4340 (sec. 10.2),
           http://www.ietf.org/rfc/rfc4340.txt
diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c
index 60c412ccfeef..4902029854d8 100644
--- a/net/dccp/ccids/lib/tfrc.c
+++ b/net/dccp/ccids/lib/tfrc.c
@@ -36,7 +36,7 @@ out:
         return rc;
 }
 
-void __exit tfrc_lib_exit(void)
+void tfrc_lib_exit(void)
 {
         tfrc_rx_packet_history_exit();
         tfrc_tx_packet_history_exit();
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index 5aa024b99c55..2f2d731bc1c2 100644
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -124,7 +124,7 @@ static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_m
 static inline void tipc_nmap_diff(struct tipc_node_map *nm_a, struct tipc_node_map *nm_b,
                                   struct tipc_node_map *nm_diff)
 {
-        int stop = sizeof(nm_a->map) / sizeof(u32);
+        int stop = ARRAY_SIZE(nm_a->map);
         int w;
         int b;
         u32 map;
diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index c609a4b98e15..42cd18391f46 100644
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -63,7 +63,6 @@ static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
         if (len > skb_tailroom(skb))
                 len = skb_tailroom(skb);
 
-        skb->truesize += len;
         __skb_put(skb, len);
 
         len += plen;