mmc: s3c6410: enable ADMA feature in 6410 sdhci controller

[safe/jmp/linux-2.6] / net / tipc / eth_media.c

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index d6fc057..6230d16 100644 (file)
--- 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 <linux/slab.h>
 #include <net/net_namespace.h>
 
 #define MAX_ETH_BEARERS                2
@@ -77,12 +78,12 @@ 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);
        }
-       return TIPC_OK;
+       return 0;
 }
 
 /**
@@ -101,7 +102,7 @@ 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) {
+       if (!net_eq(dev_net(dev), &init_net)) {
                kfree_skb(buf);
                return 0;
        }
@@ -113,12 +114,12 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
                        if (likely(buf->len == size)) {
                                buf->next = NULL;
                                tipc_recv_msg(buf, eb_ptr->bearer);
-                               return TIPC_OK;
+                               return 0;
                        }
                }
        }
        kfree_skb(buf);
-       return TIPC_OK;
+       return 0;
 }
 
 /**
@@ -167,7 +168,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
        tb_ptr->mtu = dev->mtu;
        tb_ptr->blocked = 0;
        tb_ptr->addr.type = htonl(TIPC_MEDIA_TYPE_ETH);
-       memcpy(&tb_ptr->addr.dev_addr, &dev->dev_addr, ETH_ALEN);
+       memcpy(&tb_ptr->addr.dev_addr, dev->dev_addr, ETH_ALEN);
        return 0;
 }
 
@@ -198,7 +199,7 @@ 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)
+       if (!net_eq(dev_net(dev), &init_net))
                return NOTIFY_DONE;
 
        while ((eb_ptr->dev != dev)) {
@@ -247,8 +248,7 @@ static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size
        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, "%pM", addr);
        return str_buf;
 }