Merge branch 'master' into csb1725

[mv-sheeva.git] / net / phonet / datagram.c

diff --git a/net/phonet/datagram.c b/net/phonet/datagram.c
index 1bd38db4fe1e996df47396d43acd296e9811fa1b..2f032381bd4554226cd7d30a4bd104777caa5758 100644 (file)
--- a/net/phonet/datagram.c
+++ b/net/phonet/datagram.c
@@ -52,6 +52,19 @@ static int pn_ioctl(struct sock *sk, int cmd, unsigned long arg)
                answ = skb ? skb->len : 0;
                release_sock(sk);
                return put_user(answ, (int __user *)arg);
+
+       case SIOCPNADDRESOURCE:
+       case SIOCPNDELRESOURCE: {
+                       u32 res;
+                       if (get_user(res, (u32 __user *)arg))
+                               return -EFAULT;
+                       if (res >= 256)
+                               return -EINVAL;
+                       if (cmd == SIOCPNADDRESOURCE)
+                               return pn_sock_bind_res(sk, res);
+                       else
+                               return pn_sock_unbind_res(sk, res);
+               }
        }
 
        return -ENOIOCTLCMD;