vserver 1.9.5.x5

[linux-2.6.git] / net / irda / af_irda.c

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index f415a4e..5dd00fe 100644 (file)
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -298,7 +298,7 @@ static void irda_connect_indication(void *instance, void *sap,
  *    Accept incoming connection
  *
  */
-void irda_connect_response(struct irda_sock *self)
+static void irda_connect_response(struct irda_sock *self)
 {
        struct sk_buff *skb;
 
@@ -1155,7 +1155,7 @@ static int irda_create(struct socket *sock, int protocol)
  *    Destroy socket
  *
  */
-void irda_destroy_socket(struct irda_sock *self)
+static void irda_destroy_socket(struct irda_sock *self)
 {
        IRDA_DEBUG(2, "%s(%p)\n", __FUNCTION__, self);
 
@@ -2005,7 +2005,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
                }
 
                /* Remove the attribute (and maybe the object) */
-               irias_delete_attrib(ias_obj, ias_attr);
+               irias_delete_attrib(ias_obj, ias_attr, 1);
                kfree(ias_opt);
                break;
        case IRLMP_MAX_SDU_SIZE: