Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Benjamin Romer and committed by
Greg Kroah-Hartman
29a9e895 d283f0c6

+25 -23
+25 -23
drivers/staging/unisys/uislib/uisutils.c
··· 229 229 offset += size; 230 230 count++; 231 231 } 232 - if (numfrags) { 233 - if ((count + numfrags) > frags_max) { 234 - LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n", 235 - calling_ctx, frags_max, count + numfrags); 232 + if (!numfrags) 233 + goto dolist; 234 + 235 + if ((count + numfrags) > frags_max) { 236 + LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n", 237 + calling_ctx, frags_max, count + numfrags); 238 + return -1; /* failure */ 239 + } 240 + 241 + for (ii = 0; ii < numfrags; ii++) { 242 + count = add_physinfo_entries(page_to_pfn( 243 + skb_frag_page(&skb_shinfo(skb)->frags[ii])), 244 + skb_shinfo(skb)->frags[ii]. 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"); 236 251 return -1; /* failure */ 237 252 } 238 - 239 - for (ii = 0; ii < numfrags; ii++) { 240 - count = add_physinfo_entries(page_to_pfn(skb_frag_page(&skb_shinfo(skb)->frags[ii])), /* pfn */ 241 - skb_shinfo(skb)->frags[ii]. 242 - page_offset, 243 - skb_shinfo(skb)->frags[ii]. 244 - size, count, frags_max, 245 - frags); 246 - if (count == 0) { 247 - LOGERR("**** FAILED to add physinfo entries\n"); 248 - return -1; /* failure */ 249 - } 250 - } 251 253 } 252 - if (skb_shinfo(skb)->frag_list) { 254 + 255 + dolist: if (skb_shinfo(skb)->frag_list) { 253 256 struct sk_buff *skbinlist; 254 257 int c; 255 258 ··· 260 257 skbinlist = skbinlist->next) { 261 258 262 259 c = uisutil_copy_fragsinfo_from_skb("recursive", 263 - skbinlist, 264 - skbinlist->len - 265 - skbinlist->data_len, 266 - frags_max - count, 267 - &frags[count]); 260 + skbinlist, 261 + skbinlist->len - skbinlist->data_len, 262 + frags_max - count, 263 + &frags[count]); 268 264 if (c == -1) { 269 265 LOGERR("**** FAILED recursive call failed\n"); 270 266 return -1;