diff options
author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-08-18 09:29:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-25 20:16:06 -0400 |
commit | 29a9e89548408028498bb63bcaabe2806232e26a (patch) | |
tree | a98613743e91cd8256635f74c54ca30a2d80cf58 | |
parent | d283f0c62e331fc3516e6e25d1500de799712207 (diff) |
staging: unisys: fix indentation of uisutil_copy_fragsinfo_from_skb()
The function uisutil_copy_fragsinfo_from_skb() in uisutils.c is messy and
over-indented. This patch fixes the function's indentation so it is cleaner.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/unisys/uislib/uisutils.c | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c index 423cbc4b72f9..d175d03c5258 100644 --- a/drivers/staging/unisys/uislib/uisutils.c +++ b/drivers/staging/unisys/uislib/uisutils.c | |||
@@ -229,27 +229,30 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in, | |||
229 | offset += size; | 229 | offset += size; |
230 | count++; | 230 | count++; |
231 | } | 231 | } |
232 | if (numfrags) { | 232 | if (!numfrags) |
233 | if ((count + numfrags) > frags_max) { | 233 | goto dolist; |
234 | LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n", | ||
235 | calling_ctx, frags_max, count + numfrags); | ||
236 | return -1; /* failure */ | ||
237 | } | ||
238 | 234 | ||
239 | for (ii = 0; ii < numfrags; ii++) { | 235 | if ((count + numfrags) > frags_max) { |
240 | count = add_physinfo_entries(page_to_pfn(skb_frag_page(&skb_shinfo(skb)->frags[ii])), /* pfn */ | 236 | LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n", |
241 | skb_shinfo(skb)->frags[ii]. | 237 | calling_ctx, frags_max, count + numfrags); |
242 | page_offset, | 238 | return -1; /* failure */ |
243 | skb_shinfo(skb)->frags[ii]. | 239 | } |
244 | size, count, frags_max, | 240 | |
245 | frags); | 241 | for (ii = 0; ii < numfrags; ii++) { |
246 | if (count == 0) { | 242 | count = add_physinfo_entries(page_to_pfn( |
247 | LOGERR("**** FAILED to add physinfo entries\n"); | 243 | skb_frag_page(&skb_shinfo(skb)->frags[ii])), |
248 | return -1; /* failure */ | 244 | skb_shinfo(skb)->frags[ii]. |
249 | } | 245 | page_offset, |
246 | skb_shinfo(skb)->frags[ii]. | ||
247 | size, count, frags_max, | ||
248 | frags); | ||
249 | if (count == 0) { | ||
250 | LOGERR("**** FAILED to add physinfo entries\n"); | ||
251 | return -1; /* failure */ | ||
250 | } | 252 | } |
251 | } | 253 | } |
252 | if (skb_shinfo(skb)->frag_list) { | 254 | |
255 | dolist: if (skb_shinfo(skb)->frag_list) { | ||
253 | struct sk_buff *skbinlist; | 256 | struct sk_buff *skbinlist; |
254 | int c; | 257 | int c; |
255 | 258 | ||
@@ -257,11 +260,10 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in, | |||
257 | skbinlist = skbinlist->next) { | 260 | skbinlist = skbinlist->next) { |
258 | 261 | ||
259 | c = uisutil_copy_fragsinfo_from_skb("recursive", | 262 | c = uisutil_copy_fragsinfo_from_skb("recursive", |
260 | skbinlist, | 263 | skbinlist, |
261 | skbinlist->len - | 264 | skbinlist->len - skbinlist->data_len, |
262 | skbinlist->data_len, | 265 | frags_max - count, |
263 | frags_max - count, | 266 | &frags[count]); |
264 | &frags[count]); | ||
265 | if (c == -1) { | 267 | if (c == -1) { |
266 | LOGERR("**** FAILED recursive call failed\n"); | 268 | LOGERR("**** FAILED recursive call failed\n"); |
267 | return -1; | 269 | return -1; |