mac80211: correct legacy rates check in ieee80211_calc_rx_airtime

[platform/kernel/linux-rpi.git] / scripts / kernel-doc

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index cfcb607..5d54b57 100755 (executable)
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1245,6 +1245,13 @@ sub dump_struct($$) {
        $members =~ s/\s*CRYPTO_MINALIGN_ATTR/ /gos;
        $members =~ s/\s*____cacheline_aligned_in_smp/ /gos;
        $members =~ s/\s*____cacheline_aligned/ /gos;
+       # unwrap struct_group():
+       # - first eat non-declaration parameters and rewrite for final match
+       # - then remove macro, outer parens, and trailing semicolon
+       $members =~ s/\bstruct_group\s*\(([^,]*,)/STRUCT_GROUP(/gos;
+       $members =~ s/\bstruct_group_(attr|tagged)\s*\(([^,]*,){2}/STRUCT_GROUP(/gos;
+       $members =~ s/\b__struct_group\s*\(([^,]*,){3}/STRUCT_GROUP(/gos;
+       $members =~ s/\bSTRUCT_GROUP(\(((?:(?>[^)(]+)|(?1))*)\))[^;]*;/$2/gos;
 
        my $args = qr{([^,)]+)};
        # replace DECLARE_BITMAP
@@ -1256,6 +1263,8 @@ sub dump_struct($$) {
        $members =~ s/DECLARE_KFIFO\s*\($args,\s*$args,\s*$args\)/$2 \*$1/gos;
        # replace DECLARE_KFIFO_PTR
        $members =~ s/DECLARE_KFIFO_PTR\s*\($args,\s*$args\)/$2 \*$1/gos;
+       # replace DECLARE_FLEX_ARRAY
+       $members =~ s/(?:__)?DECLARE_FLEX_ARRAY\s*\($args,\s*$args\)/$1 $2\[\]/gos;
        my $declaration = $members;
 
        # Split nested struct/union elements as newer ones