Commit 29a9e895 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

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: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d283f0c6
...@@ -229,7 +229,9 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in, ...@@ -229,7 +229,9 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in,
offset += size; offset += size;
count++; count++;
} }
if (numfrags) { if (!numfrags)
goto dolist;
if ((count + numfrags) > frags_max) { if ((count + numfrags) > frags_max) {
LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n", LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n",
calling_ctx, frags_max, count + numfrags); calling_ctx, frags_max, count + numfrags);
...@@ -237,7 +239,8 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in, ...@@ -237,7 +239,8 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in,
} }
for (ii = 0; ii < numfrags; ii++) { for (ii = 0; ii < numfrags; ii++) {
count = add_physinfo_entries(page_to_pfn(skb_frag_page(&skb_shinfo(skb)->frags[ii])), /* pfn */ count = add_physinfo_entries(page_to_pfn(
skb_frag_page(&skb_shinfo(skb)->frags[ii])),
skb_shinfo(skb)->frags[ii]. skb_shinfo(skb)->frags[ii].
page_offset, page_offset,
skb_shinfo(skb)->frags[ii]. skb_shinfo(skb)->frags[ii].
...@@ -248,8 +251,8 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in, ...@@ -248,8 +251,8 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in,
return -1; /* failure */ return -1; /* failure */
} }
} }
}
if (skb_shinfo(skb)->frag_list) { dolist: if (skb_shinfo(skb)->frag_list) {
struct sk_buff *skbinlist; struct sk_buff *skbinlist;
int c; int c;
...@@ -258,8 +261,7 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in, ...@@ -258,8 +261,7 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in,
c = uisutil_copy_fragsinfo_from_skb("recursive", c = uisutil_copy_fragsinfo_from_skb("recursive",
skbinlist, skbinlist,
skbinlist->len - skbinlist->len - skbinlist->data_len,
skbinlist->data_len,
frags_max - count, frags_max - count,
&frags[count]); &frags[count]);
if (c == -1) { if (c == -1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment