Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / net / phonet / af_phonet.c

diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index 9e9c6fce11aad1ff98a79675c1c840aa79dec4de..defeb7a0d502ab92dcc7253f0f97e10ae341209e 100644 (file)
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -67,11 +67,10 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol)
        }
 
        pnp = phonet_proto_get(protocol);
-#ifdef CONFIG_KMOD
        if (pnp == NULL &&
            request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0)
                pnp = phonet_proto_get(protocol);
-#endif
+
        if (pnp == NULL)
                return -EPROTONOSUPPORT;
        if (sock->type != pnp->sock_type) {
@@ -262,6 +261,8 @@ static inline int can_respond(struct sk_buff *skb)
                return 0; /* we are not the destination */
        if (ph->pn_res == PN_PREFIX && !pskb_may_pull(skb, 5))
                return 0;
+       if (ph->pn_res == PN_COMMGR) /* indications */
+               return 0;
 
        ph = pn_hdr(skb); /* re-acquires the pointer */
        pm = pn_msg(skb);
@@ -310,7 +311,8 @@ static int send_reset_indications(struct sk_buff *rskb)
 
        return pn_raw_send(data, sizeof(data), rskb->dev,
                                pn_object(oph->pn_sdev, 0x00),
-                               pn_object(oph->pn_rdev, oph->pn_robj), 0x10);
+                               pn_object(oph->pn_rdev, oph->pn_robj),
+                               PN_COMMGR);
 }