From 6411a11ec1809ba3cabe8cc0f6a078cad1035a8c Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Fri, 13 Jul 2012 07:22:47 +0000 Subject: [PATCH] --- yaml --- r: 315407 b: refs/heads/master c: ad8c94532acbd64e7ada25ce188befb6ef6b2027 h: refs/heads/master i: 315405: 8a2d7314eaa8ce7810160f34f139c6527d65a2a3 315403: 9b0a8d79ea7c99f94fd228af97c36a0afcb4d984 315399: d03a554aaeae1f6eb1a999ca715b0120c66c981e 315391: 759ec0d58a0b327959a09290fe1a308eaff7007d v: v3 --- [refs] | 2 +- trunk/net/irda/af_irda.c | 2 +- trunk/net/irda/irlan/irlan_provider.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f54da60a91c..ec7783e2b6bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db28aafad91ee23b7075e5372d92ed364d54e9fb +refs/heads/master: ad8c94532acbd64e7ada25ce188befb6ef6b2027 diff --git a/trunk/net/irda/af_irda.c b/trunk/net/irda/af_irda.c index bb14c3477680..bb738c9f9146 100644 --- a/trunk/net/irda/af_irda.c +++ b/trunk/net/irda/af_irda.c @@ -955,7 +955,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) * The main difference with a "standard" connect is that with IrDA we need * to resolve the service name into a TSAP selector (in TCP, port number * doesn't have to be resolved). - * Because of this service name resoltion, we can offer "auto-connect", + * Because of this service name resolution, we can offer "auto-connect", * where we connect to a service without specifying a destination address. * * Note : by consulting "errno", the user space caller may learn the cause diff --git a/trunk/net/irda/irlan/irlan_provider.c b/trunk/net/irda/irlan/irlan_provider.c index 32dcaac70b0c..4664855222f4 100644 --- a/trunk/net/irda/irlan/irlan_provider.c +++ b/trunk/net/irda/irlan/irlan_provider.c @@ -296,7 +296,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER + /* Bigger param length comes from CMD_GET_MEDIA_CHAR */ IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "DIRECTED") + - IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BORADCAST") + + IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BROADCAST") + IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "MULTICAST") + IRLAN_STRING_PARAMETER_LEN("ACCESS_TYPE", "HOSTED"), GFP_ATOMIC);