Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 19 insertions, 7 deletions

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 711ca4b1f051..3bbef2ab22ae 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -38,6 +38,7 @@
 #include <net/tipc/tipc_bearer.h>
 #include <net/tipc/tipc_msg.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 
 #define MAX_ETH_BEARERS         2
 #define ETH_LINK_PRIORITY       TIPC_DEF_LINK_PRI
@@ -76,7 +77,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
                 skb_reset_network_header(clone);
                 dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev;
                 clone->dev = dev;
-                dev->hard_header(clone, dev, ETH_P_TIPC,
+                dev_hard_header(clone, dev, ETH_P_TIPC,
                                  &dest->dev_addr.eth_addr,
                                  dev->dev_addr, clone->len);
                 dev_queue_xmit(clone);
@@ -100,6 +101,11 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
         struct eth_bearer *eb_ptr = (struct eth_bearer *)pt->af_packet_priv;
         u32 size;
 
+        if (dev->nd_net != &init_net) {
+                kfree_skb(buf);
+                return 0;
+        }
+
         if (likely(eb_ptr->bearer)) {
                 if (likely(buf->pkt_type <= PACKET_BROADCAST)) {
                         size = msg_size((struct tipc_msg *)buf->data);
@@ -129,7 +135,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
 
         /* Find device with specified name */
 
-        for_each_netdev(pdev){
+        for_each_netdev(&init_net, pdev){
                 if (!strncmp(pdev->name, driver_name, IFNAMSIZ)) {
                         dev = pdev;
                         break;
@@ -192,6 +198,9 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
         struct eth_bearer *eb_ptr = &eth_bearers[0];
         struct eth_bearer *stop = &eth_bearers[MAX_ETH_BEARERS];
 
+        if (dev->nd_net != &init_net)
+                return NOTIFY_DONE;
+
         while ((eb_ptr->dev != dev)) {
                 if (++eb_ptr == stop)
                         return NOTIFY_DONE;     /* couldn't find device */
@@ -234,12 +243,12 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
 static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size)
 {
         unchar *addr = (unchar *)&a->dev_addr;
+        DECLARE_MAC_BUF(mac);
 
         if (str_size < 18)
                 *str_buf = '\0';
         else
-                sprintf(str_buf, "%02x:%02x:%02x:%02x:%02x:%02x",
-                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+                sprintf(str_buf, "%s", print_mac(mac, addr));
         return str_buf;
 }
 
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 84110172031e..e36b4b5a5222 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -162,13 +162,16 @@ static void advance_queue(struct tipc_sock *tsock)
  *
  * Returns 0 on success, errno otherwise
  */
-static int tipc_create(struct socket *sock, int protocol)
+static int tipc_create(struct net *net, struct socket *sock, int protocol)
 {
         struct tipc_sock *tsock;
         struct tipc_port *port;
         struct sock *sk;
         u32 ref;
 
+        if (net != &init_net)
+                return -EAFNOSUPPORT;
+
         if (unlikely(protocol != 0))
                 return -EPROTONOSUPPORT;
 
@@ -198,7 +201,7 @@ static int tipc_create(struct socket *sock, int protocol)
                 return -EPROTOTYPE;
         }
 
-        sk = sk_alloc(AF_TIPC, GFP_KERNEL, &tipc_proto, 1);
+        sk = sk_alloc(net, AF_TIPC, GFP_KERNEL, &tipc_proto, 1);
         if (!sk) {
                 tipc_deleteport(ref);
                 return -ENOMEM;
@@ -1372,7 +1375,7 @@ static int accept(struct socket *sock, struct socket *newsock, int flags)
         }
         buf = skb_peek(&sock->sk->sk_receive_queue);
 
-        res = tipc_create(newsock, 0);
+        res = tipc_create(sock->sk->sk_net, newsock, 0);
         if (!res) {
                 struct tipc_sock *new_tsock = tipc_sk(newsock->sk);
                 struct tipc_portid id;