---

yaml --- r: 315407 b: refs/heads/master c: ad8c945 h: refs/heads/master i: 315405: 8a2d731 315403: 9b0a8d7 315399: d03a554 315391: 759ec0d v: v3
git-mirror · Jul 17, 2012 · 6411a11 · 6411a11
1 parent 89161c3
commit 6411a11
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);