diff options
Diffstat (limited to 'net/irda/parameters.c')
-rw-r--r-- | net/irda/parameters.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/irda/parameters.c b/net/irda/parameters.c index 7183e9ef7996..722bbe044d9c 100644 --- a/net/irda/parameters.c +++ b/net/irda/parameters.c | |||
@@ -133,7 +133,7 @@ static int irda_insert_integer(void *self, __u8 *buf, int len, __u8 pi, | |||
133 | int err; | 133 | int err; |
134 | 134 | ||
135 | p.pi = pi; /* In case handler needs to know */ | 135 | p.pi = pi; /* In case handler needs to know */ |
136 | p.pl = type & PV_MASK; /* The integer type codes the lenght as well */ | 136 | p.pl = type & PV_MASK; /* The integer type codes the length as well */ |
137 | p.pv.i = 0; /* Clear value */ | 137 | p.pv.i = 0; /* Clear value */ |
138 | 138 | ||
139 | /* Call handler for this parameter */ | 139 | /* Call handler for this parameter */ |
@@ -142,7 +142,7 @@ static int irda_insert_integer(void *self, __u8 *buf, int len, __u8 pi, | |||
142 | return err; | 142 | return err; |
143 | 143 | ||
144 | /* | 144 | /* |
145 | * If parameter lenght is still 0, then (1) this is an any length | 145 | * If parameter length is still 0, then (1) this is an any length |
146 | * integer, and (2) the handler function does not care which length | 146 | * integer, and (2) the handler function does not care which length |
147 | * we choose to use, so we pick the one the gives the fewest bytes. | 147 | * we choose to use, so we pick the one the gives the fewest bytes. |
148 | */ | 148 | */ |
@@ -206,11 +206,11 @@ static int irda_extract_integer(void *self, __u8 *buf, int len, __u8 pi, | |||
206 | { | 206 | { |
207 | irda_param_t p; | 207 | irda_param_t p; |
208 | int n = 0; | 208 | int n = 0; |
209 | int extract_len; /* Real lenght we extract */ | 209 | int extract_len; /* Real length we extract */ |
210 | int err; | 210 | int err; |
211 | 211 | ||
212 | p.pi = pi; /* In case handler needs to know */ | 212 | p.pi = pi; /* In case handler needs to know */ |
213 | p.pl = buf[1]; /* Extract lenght of value */ | 213 | p.pl = buf[1]; /* Extract length of value */ |
214 | p.pv.i = 0; /* Clear value */ | 214 | p.pv.i = 0; /* Clear value */ |
215 | extract_len = p.pl; /* Default : extract all */ | 215 | extract_len = p.pl; /* Default : extract all */ |
216 | 216 | ||
@@ -297,7 +297,7 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi, | |||
297 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 297 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); |
298 | 298 | ||
299 | p.pi = pi; /* In case handler needs to know */ | 299 | p.pi = pi; /* In case handler needs to know */ |
300 | p.pl = buf[1]; /* Extract lenght of value */ | 300 | p.pl = buf[1]; /* Extract length of value */ |
301 | 301 | ||
302 | IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __FUNCTION__, | 302 | IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __FUNCTION__, |
303 | p.pi, p.pl); | 303 | p.pi, p.pl); |
@@ -339,7 +339,7 @@ static int irda_extract_octseq(void *self, __u8 *buf, int len, __u8 pi, | |||
339 | irda_param_t p; | 339 | irda_param_t p; |
340 | 340 | ||
341 | p.pi = pi; /* In case handler needs to know */ | 341 | p.pi = pi; /* In case handler needs to know */ |
342 | p.pl = buf[1]; /* Extract lenght of value */ | 342 | p.pl = buf[1]; /* Extract length of value */ |
343 | 343 | ||
344 | /* Check if buffer is long enough for parsing */ | 344 | /* Check if buffer is long enough for parsing */ |
345 | if (len < (2+p.pl)) { | 345 | if (len < (2+p.pl)) { |