Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 36 insertions, 13 deletions

diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index 73aee7f2fcdc..c6fffd946d42 100644
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -37,7 +37,7 @@
 /* Transport protocol registration */
 static struct phonet_protocol *proto_tab[PHONET_NPROTO] __read_mostly;
 
-static struct phonet_protocol *phonet_proto_get(int protocol)
+static struct phonet_protocol *phonet_proto_get(unsigned int protocol)
 {
         struct phonet_protocol *pp;
 
@@ -110,6 +110,7 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol,
         sk->sk_protocol = protocol;
         pn = pn_sk(sk);
         pn->sobject = 0;
+        pn->dobject = 0;
         pn->resource = 0;
         sk->sk_prot->init(sk);
         err = 0;
@@ -194,11 +195,7 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev,
         if (skb->pkt_type == PACKET_LOOPBACK) {
                 skb_reset_mac_header(skb);
                 skb_orphan(skb);
-                if (irq)
-                        netif_rx(skb);
-                else
-                        netif_rx_ni(skb);
-                err = 0;
+                err = (irq ? netif_rx(skb) : netif_rx_ni(skb)) ? -ENOBUFS : 0;
         } else {
                 err = dev_hard_header(skb, dev, ntohs(skb->protocol),
                                         NULL, NULL, skb->len);
@@ -207,6 +204,8 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev,
                         goto drop;
                 }
                 err = dev_queue_xmit(skb);
+                if (unlikely(err > 0))
+                        err = net_xmit_errno(err);
         }
 
         return err;
@@ -242,8 +241,18 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb,
         struct net_device *dev;
         struct pn_sock *pn = pn_sk(sk);
         int err;
-        u16 src;
-        u8 daddr = pn_sockaddr_get_addr(target), saddr = PN_NO_ADDR;
+        u16 src, dst;
+        u8 daddr, saddr, res;
+
+        src = pn->sobject;
+        if (target != NULL) {
+                dst = pn_sockaddr_get_object(target);
+                res = pn_sockaddr_get_resource(target);
+        } else {
+                dst = pn->dobject;
+                res = pn->resource;
+        }
+        daddr = pn_addr(dst);
 
         err = -EHOSTUNREACH;
         if (sk->sk_bound_dev_if)
@@ -251,6 +260,15 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb,
         else if (phonet_address_lookup(net, daddr) == 0) {
                 dev = phonet_device_get(net);
                 skb->pkt_type = PACKET_LOOPBACK;
+        } else if (dst == 0) {
+                /* Resource routing (small race until phonet_rcv()) */
+                struct sock *sk = pn_find_sock_by_res(net, res);
+                if (sk) {
+                        sock_put(sk);
+                        dev = phonet_device_get(net);
+                        skb->pkt_type = PACKET_LOOPBACK;
+                } else
+                        dev = phonet_route_output(net, daddr);
         } else
                 dev = phonet_route_output(net, daddr);
 
@@ -261,12 +279,10 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb,
         if (saddr == PN_NO_ADDR)
                 goto drop;
 
-        src = pn->sobject;
         if (!pn_addr(src))
                 src = pn_object(saddr, pn_obj(src));
 
-        err = pn_send(skb, dev, pn_sockaddr_get_object(target),
-                        src, pn_sockaddr_get_resource(target), 0);
+        err = pn_send(skb, dev, dst, src, res, 0);
         dev_put(dev);
         return err;
 
@@ -383,6 +399,13 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev,
                 goto out;
         }
 
+        /* resource routing */
+        if (pn_sockaddr_get_object(&sa) == 0) {
+                struct sock *sk = pn_find_sock_by_res(net, sa.spn_resource);
+                if (sk)
+                        return sk_receive_skb(sk, skb, 0);
+        }
+
         /* check if we are the destination */
         if (phonet_address_lookup(net, pn_sockaddr_get_addr(&sa)) == 0) {
                 /* Phonet packet input */
@@ -441,7 +464,7 @@ static struct packet_type phonet_packet_type __read_mostly = {
 
 static DEFINE_MUTEX(proto_tab_lock);
 
-int __init_or_module phonet_proto_register(int protocol,
+int __init_or_module phonet_proto_register(unsigned int protocol,
                                                 struct phonet_protocol *pp)
 {
         int err = 0;
@@ -464,7 +487,7 @@ int __init_or_module phonet_proto_register(int protocol,
 }
 EXPORT_SYMBOL(phonet_proto_register);
 
-void phonet_proto_unregister(int protocol, struct phonet_protocol *pp)
+void phonet_proto_unregister(unsigned int protocol, struct phonet_protocol *pp)
 {
         mutex_lock(&proto_tab_lock);
         BUG_ON(proto_tab[protocol] != pp);