diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2008-12-04 00:42:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-04 00:42:56 +0100 |
| commit | 52404881984e2d447f920a23e3bb63262dfc77f3 (patch) | |
| tree | 531b4ac50fe372d26bf950c77d31f2ddcb40153c /net/phonet/af_phonet.c | |
| parent | xfrm: Accept XFRM_STATE_AF_UNSPEC SAs on IPv4/IPv6 only hosts (diff) | |
| download | linux-52404881984e2d447f920a23e3bb63262dfc77f3.tar.xz linux-52404881984e2d447f920a23e3bb63262dfc77f3.zip | |
Phonet: basic net namespace support
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet/af_phonet.c')
| -rw-r--r-- | net/phonet/af_phonet.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 9d211f12582b..13cb323f8c38 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -67,9 +67,6 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol) struct phonet_protocol *pnp; int err; - if (net != &init_net) - return -EAFNOSUPPORT; - if (!capable(CAP_SYS_ADMIN)) return -EPERM; @@ -352,9 +349,6 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev, struct sockaddr_pn sa; u16 len; - if (dev_net(dev) != &init_net) - goto out; - /* check we have at least a full Phonet header */ if (!pskb_pull(skb, sizeof(struct phonethdr))) goto out; @@ -373,7 +367,7 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev, if (pn_sockaddr_get_addr(&sa) == 0) goto out; /* currently, we cannot be device 0 */ - sk = pn_find_sock_by_sa(&sa); + sk = pn_find_sock_by_sa(dev_net(dev), &sa); if (sk == NULL) { if (can_respond(skb)) { send_obj_unreachable(skb); |