* [PATCH] staging: rtl8723bs: Use shared header constants @ 2020-05-23 21:29 Pascal Terjan 2020-05-27 8:15 ` Greg Kroah-Hartman 2020-05-27 19:48 ` Dan Carpenter 0 siblings, 2 replies; 7+ messages in thread From: Pascal Terjan @ 2020-05-23 21:29 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel; +Cc: Pascal Terjan This is one of the 9 drivers redefining rfc1042_header. Signed-off-by: Pascal Terjan <pterjan@google.com> --- drivers/staging/rtl8723bs/core/rtw_recv.c | 15 ++++++--------- drivers/staging/rtl8723bs/include/rtw_recv.h | 2 -- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 5 +++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index 5245098b9ecf..dc58822924b4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -10,14 +10,11 @@ #include <rtw_debug.h> #include <linux/jiffies.h> #include <rtw_recv.h> +#include <net/cfg80211.h> static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37}; static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3}; -u8 rtw_rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; -/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */ -u8 rtw_bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; - static void rtw_signal_stat_timer_hdl(struct timer_list *t); void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) @@ -1625,11 +1622,11 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe) psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; /* convert hdr + possible LLC headers into Ethernet header */ /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ - if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && - (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) && - (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2))) || - /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ - !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) { + if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) && + memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) && + memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)) || + /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ + !memcmp(psnap, bridge_tunnel_header, SNAP_SIZE)) { /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ bsnaphdr = true; } else diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 98c3e92245b7..a851b818ef0e 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -38,8 +38,6 @@ #define RX_MAX_QUEUE 2 #define MAX_SUBFRAME_COUNT 64 -extern u8 rtw_rfc1042_header[]; -extern u8 rtw_bridge_tunnel_header[]; /* for Rx reordering buffer control */ struct recv_reorder_ctrl diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c index 2a7b9922b1d4..eb4d1c3008fe 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,6 +9,7 @@ #include <drv_types.h> #include <rtw_debug.h> #include <linux/jiffies.h> +#include <net/cfg80211.h> void rtw_os_free_recvframe(union recv_frame *precvframe) { @@ -71,9 +72,9 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 eth_type = RTW_GET_BE16(&sub_skb->data[6]); if (sub_skb->len >= 8 && - ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) && + ((!memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) && eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || - !memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE))) { + !memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE))) { /* * remove RFC1042 or Bridge-Tunnel encapsulation and replace * EtherType -- 2.27.0.rc0.183.gde8f92d652-goog _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Use shared header constants 2020-05-23 21:29 [PATCH] staging: rtl8723bs: Use shared header constants Pascal Terjan @ 2020-05-27 8:15 ` Greg Kroah-Hartman 2020-05-27 19:48 ` Dan Carpenter 1 sibling, 0 replies; 7+ messages in thread From: Greg Kroah-Hartman @ 2020-05-27 8:15 UTC (permalink / raw) To: Pascal Terjan; +Cc: devel, linux-kernel On Sat, May 23, 2020 at 10:29:19PM +0100, Pascal Terjan wrote: > This is one of the 9 drivers redefining rfc1042_header. I do not understand what this changelog is trying to say. Can you fix this up to be more explicit and detained and resend? thanks, greg k-h _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Use shared header constants 2020-05-23 21:29 [PATCH] staging: rtl8723bs: Use shared header constants Pascal Terjan 2020-05-27 8:15 ` Greg Kroah-Hartman @ 2020-05-27 19:48 ` Dan Carpenter 2020-05-27 20:33 ` Pascal Terjan 2020-05-27 20:51 ` [PATCH v2] staging: rtl8723bs: Use common packet " Pascal Terjan 1 sibling, 2 replies; 7+ messages in thread From: Dan Carpenter @ 2020-05-27 19:48 UTC (permalink / raw) To: Pascal Terjan; +Cc: devel, Greg Kroah-Hartman, linux-kernel On Sat, May 23, 2020 at 10:29:19PM +0100, Pascal Terjan wrote: > This is one of the 9 drivers redefining rfc1042_header. > This is how the patch looks like in my email client: https://marc.info/?l=linux-driver-devel&m=159026973821890&w=2 Do you see how the subject is far away from the body of the commit message? I normally only read the subject or the body when I'm reviewing patches so it's good if the body is clear on its own. Maybe write something like: "This driver creates a local definitions of "rtw_rfc1042_header" and "rtw_bridge_tunnel_header" but it should just use the standard definitions from cfg80211.h." > void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) > @@ -1625,11 +1622,11 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe) > psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; > /* convert hdr + possible LLC headers into Ethernet header */ > /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ > - if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && > - (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) && > - (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2))) || > - /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ > - !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) { > + if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) && > + memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) && > + memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)) || > + /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ > + !memcmp(psnap, bridge_tunnel_header, SNAP_SIZE)) { > /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ > bsnaphdr = true; Your indenting is correct, but I would probably do that in a separate patch. It makes it harder to review. Also probably delete the commented out code. Do you see how if we don't touch the indenting then it doesn't raise the question about if we should delete the comments as well? regards, dan carpenter _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Use shared header constants 2020-05-27 19:48 ` Dan Carpenter @ 2020-05-27 20:33 ` Pascal Terjan 2020-05-28 9:16 ` Dan Carpenter 2020-05-27 20:51 ` [PATCH v2] staging: rtl8723bs: Use common packet " Pascal Terjan 1 sibling, 1 reply; 7+ messages in thread From: Pascal Terjan @ 2020-05-27 20:33 UTC (permalink / raw) To: Dan Carpenter; +Cc: devel, Greg Kroah-Hartman, linux-kernel On Wed, 27 May 2020 at 20:48, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > On Sat, May 23, 2020 at 10:29:19PM +0100, Pascal Terjan wrote: > > This is one of the 9 drivers redefining rfc1042_header. > > > > This is how the patch looks like in my email client: > > https://marc.info/?l=linux-driver-devel&m=159026973821890&w=2 > > Do you see how the subject is far away from the body of the commit > message? I normally only read the subject or the body when I'm > reviewing patches so it's good if the body is clear on its own. Maybe > write something like: > > "This driver creates a local definitions of "rtw_rfc1042_header" and > "rtw_bridge_tunnel_header" but it should just use the standard definitions > from cfg80211.h." Thanks, I see both together when writing the commit message and need to remember they are actually separate. > > void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) > > @@ -1625,11 +1622,11 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe) > > psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; > > /* convert hdr + possible LLC headers into Ethernet header */ > > /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ > > - if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && > > - (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) && > > - (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2))) || > > - /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ > > - !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) { > > + if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) && > > + memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) && > > + memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)) || > > + /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ > > + !memcmp(psnap, bridge_tunnel_header, SNAP_SIZE)) { > > /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ > > bsnaphdr = true; > > Your indenting is correct, but I would probably do that in a separate > patch. It makes it harder to review. Also probably delete the > commented out code. Do you see how if we don't touch the indenting then > it doesn't raise the question about if we should delete the comments as > well? I initially didn't want to change it but checkpatch was sad which makes me sad, maybe I should have cleaned up this area in a first trivial patch before touching that line. _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Use shared header constants 2020-05-27 20:33 ` Pascal Terjan @ 2020-05-28 9:16 ` Dan Carpenter 0 siblings, 0 replies; 7+ messages in thread From: Dan Carpenter @ 2020-05-28 9:16 UTC (permalink / raw) To: Pascal Terjan; +Cc: devel, Greg Kroah-Hartman, linux-kernel [-- Attachment #1: Type: text/plain, Size: 2166 bytes --] On Wed, May 27, 2020 at 09:33:03PM +0100, Pascal Terjan wrote: > On Wed, 27 May 2020 at 20:48, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > > /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ > > > - if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && > > > - (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) && > > > - (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2))) || > > > - /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ > > > - !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) { > > > + if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) && > > > + memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) && > > > + memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)) || > > > + /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ > > > + !memcmp(psnap, bridge_tunnel_header, SNAP_SIZE)) { > > > /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ > > > bsnaphdr = true; > > > > Your indenting is correct, but I would probably do that in a separate > > patch. It makes it harder to review. Also probably delete the > > commented out code. Do you see how if we don't touch the indenting then > > it doesn't raise the question about if we should delete the comments as > > well? > > I initially didn't want to change it but checkpatch was sad which > makes me sad, maybe I should have cleaned up this area in a first > trivial patch before touching that line. Just ignore checkpatch in this case because it's not a warning that your patch introduced. Say if you re-name a function, then you *must* re-indent the parameters because that's a warning the change introduces. If there is a checkpatch warning and it's on a line that you touch then you can change that. But once you start changing other nearby lines you might run into trouble. The other thing that you fixed is you removed unnecessary parentheses and that's good but it actually broke my review script for renaming variables. (Attached). I do `cat email.txt | rename_rev.pl -a` It's easier in mutt. regards, dan carpenter [-- Attachment #2: rename_rev.pl --] [-- Type: text/x-perl, Size: 11192 bytes --] #!/usr/bin/perl # This is a tool to help review variable rename patches. The goal is # to strip out the automatic sed renames and the white space changes # and leaves the interesting code changes. # # Example 1: A patch renames openInfo to open_info: # cat diff | rename_review.pl openInfo open_info # # Example 2: A patch swaps the first two arguments to some_func(): # cat diff | rename_review.pl \ # -e 's/some_func\((.*?),(.*?),/some_func\($2, $1,/' # # Example 3: A patch removes the xkcd_ prefix from some but not all the # variables. Instead of trying to figure out which variables were renamed # just remove the prefix from them all: # cat diff | rename_review.pl -ea 's/xkcd_//g' # # Example 4: A patch renames 20 CamelCase variables. To review this let's # just ignore all case changes and all '_' chars. # cat diff | rename_review -ea 'tr/[A-Z]/[a-z]/' -ea 's/_//g' # # The other arguments are: # -nc removes comments # -ns removes '\' chars if they are at the end of the line. use strict; use File::Temp qw/ :mktemp /; sub usage() { print "usage: cat diff | $0 old new old new old new...\n"; print " or: cat diff | $0 -e 's/old/new/g'\n"; print " -a : auto"; print " -e : execute on old lines\n"; print " -ea: execute on all lines\n"; print " -nc: no comments\n"; print " -nb: no unneeded braces\n"; print " -ns: no slashes at the end of a line\n"; print " -pull: for function pull. deletes context.\n"; print " -r <recipe>: NULL, bool"; exit(1); } my @subs; my @strict_subs; my @cmds; my $strip_comments; my $strip_braces; my $strip_slashes; my $pull_context; my $auto; sub filter($) { my $line = shift(); my $old = 0; if ($line =~ /^-/) { $old = 1; } # remove the first char $line =~ s/^[ +-]//; if ($strip_comments) { $line =~ s/\/\*.*?\*\///g; $line =~ s/\/\/.*//; } foreach my $cmd (@cmds) { if ($old || $cmd->[0] =~ /^-ea$/) { eval "\$line =~ $cmd->[1]"; } } foreach my $sub (@subs) { if ($old) { $line =~ s/$sub->[0]/$sub->[1]/g; } } foreach my $sub (@strict_subs) { if ($old) { $line =~ s/\b$sub->[0]\b/$sub->[1]/g; } } # remove the newline so we can move curly braces here if we want. $line =~ s/\n//; return $line; } while (my $param1 = shift()) { if ($param1 =~ /^-a$/) { $auto = 1; next; } if ($param1 =~ /^-nc$/) { $strip_comments = 1; next; } if ($param1 =~ /^-nb$/) { $strip_braces = 1; next; } if ($param1 =~ /^-ns$/) { $strip_slashes = 1; next; } if ($param1 =~ /^-pull$/) { $pull_context = 1; next; } my $param2 = shift(); if ($param2 =~ /^$/) { usage(); } if ($param1 =~ /^-e(a|)$/) { push @cmds, [$param1, $param2]; next; } if ($param1 =~ /^-r$/) { if ($param2 =~ /bool/) { push @cmds, ["-e", "s/== true//"]; push @cmds, ["-e", "s/true ==//"]; push @cmds, ["-e", "s/([a-zA-Z\-\>\._]+) == false/!\$1/"]; next; } elsif ($param2 =~ /NULL/) { push @cmds, ["-e", "s/ != NULL//"]; push @cmds, ["-e", "s/([a-zA-Z\-\>\._0-9]+) == NULL/!\$1/"]; next; } elsif ($param2 =~ /^BIT$/) { push @cmds, ["-e", 's/1[uU]* *<< *(\d+)/BIT($1)/']; push @cmds, ["-e", 's/\(1 *<< *(\w+)\)/BIT($1)/']; push @cmds, ["-e", 's/\(BIT\((.*?)\)\)/BIT($1)/']; next; } elsif ($param2 =~ /^HBIT$/) { push @cmds, ["-e", 's/0x0*1\b/BIT(0)/']; push @cmds, ["-e", 's/0x0*2\b/BIT(1)/']; push @cmds, ["-e", 's/0x0*4\b/BIT(2)/']; push @cmds, ["-e", 's/0x0*8\b/BIT(3)/']; push @cmds, ["-e", 's/0x0*10\b/BIT(4)/']; push @cmds, ["-e", 's/0x0*20\b/BIT(5)/']; push @cmds, ["-e", 's/0x0*40\b/BIT(6)/']; push @cmds, ["-e", 's/0x0*80\b/BIT(7)/']; next; } usage(); } push @subs, [$param1, $param2]; } my ($oldfh, $oldfile) = mkstemp("/tmp/oldXXXXX"); my ($newfh, $newfile) = mkstemp("/tmp/newXXXXX"); my @input = <STDIN>; # auto works on the observation that the - line comes before the + line when we # rename variables. Take the first - line. Find the first + line. Find the # one word difference. Test that the old word never occurs in the new text. if ($auto) { my %c_keywords = ( auto => 1, break => 1, case => 1, char => 1, const => 1, continue => 1, default => 1, do => 1, double => 1, else => 1, enum => 1, extern => 1, float => 1, for => 1, goto => 1, if => 1, int => 1, long => 1, register => 1, return => 1, short => 1, signed => 1, sizeof => 1, static => 1, struct => 1, switch => 1, typedef => 1, union => 1, unsigned => 1, void => 1, volatile => 1, while => 1); my %old_words; my %new_words; my %added_cmds; my @new_subs; my $inside = 0; foreach my $line (@input) { if ($line =~ /^(---|\+\+\+)/) { next; } if ($line =~ /^@/) { $inside = 1; } if ($inside && !(($_ =~ /^[- @+]/) || ($_ =~ /^$/))) { $inside = 0; } if (!$inside) { next; } if ($line =~ /^-/) { s/-//; my @words = split(/\W+/, $line); foreach my $word (@words) { $old_words{$word} = 1; } } elsif ($line =~ /^\+/) { s/\+//; my @words = split(/\W+/, $line); foreach my $word (@words) { $new_words{$word} = 1; } } } my $old_line; my $new_line; $inside = 0; foreach my $line (@input) { if ($line =~ /^(---|\+\+\+)/) { next; } if ($line =~ /^@/) { $inside = 1; } if ($inside && !(($_ =~ /^[- @+]/) || ($_ =~ /^$/))) { $inside = 0; } if (!$inside) { next; } if ($line =~ /^-/ && !$old_line) { s/^-//; $old_line = $line; next; } elsif ($old_line && $line =~ /^\+/) { s/^\+//; $new_line = $line; } else { next; } my @old_words = split(/\W+/, $old_line); my @new_words = split(/\W+/, $new_line); my @new_cmds; my $i; my $diff_count = 0; for ($i = 0; ; $i++) { if (!defined($old_words[$i]) && !defined($new_words[$i])) { last; } if (!defined($old_words[$i]) || !defined($new_words[$i])) { $diff_count = 1000; last; } if ($old_words[$i] eq $new_words[$i]) { next; } if ($c_keywords{$old_words[$i]}) { $diff_count = 1000; last; } if ($new_words{$old_words[$i]}) { $diff_count++; } push @new_cmds, [$old_words[$i], $new_words[$i]]; } if ($diff_count <= 2) { foreach my $sub (@new_cmds) { if ($added_cmds{$sub->[0] . $sub->[1]}) { next; } $added_cmds{$sub->[0] . $sub->[1]} = 1; push @new_subs, [$sub->[0] , $sub->[1]]; } } $old_line = 0; } if (@new_subs) { print "RENAMES:\n"; foreach my $sub (@new_subs) { print "$sub->[0] => $sub->[1]\n"; push @strict_subs, [$sub->[0] , $sub->[1]]; } print "---\n"; } } my $output; #recreate an old file and a new file my $inside = 0; foreach (@input) { if ($pull_context && !($_ =~ /^[+-@]/)) { next; } if ($_ =~ /^(---|\+\+\+)/) { next; } if ($_ =~ /^@/) { $inside = 1; } if ($inside && !(($_ =~ /^[- @+]/) || ($_ =~ /^$/))) { $inside = 0; } if (!$inside) { next; } $output = filter($_); if ($strip_braces && $_ =~ /^(\+|-)\W+{/) { $output =~ s/^[\t ]+(.*)/ $1/; } else { $output = "\n" . $output; } if ($_ =~ /^-/) { print $oldfh $output; next; } if ($_ =~ /^\+/) { print $newfh $output; next; } print $oldfh $output; print $newfh $output; } print $oldfh "\n"; print $newfh "\n"; # git diff puts a -- and version at the end of the diff. put the -- into the # new file as well so it's ignored if ($output =~ /\n-/) { print $newfh "-\n"; } my $hunk; my $old_txt; my $new_txt; open diff, "diff -uw $oldfile $newfile |"; while (<diff>) { if ($_ =~ /^(---|\+\+\+)/) { next; } if ($_ =~ /^@/) { if ($strip_comments) { $old_txt =~ s/\/\*.*?\*\///g; $new_txt =~ s/\/\*.*?\*\///g; } if ($strip_braces) { $old_txt =~ s/{([^;{]*?);}/$1;/g; $new_txt =~ s/{([^;{]*?);}/$1;/g; # this is a hack because i don't know how to replace nested # unneeded curly braces. $old_txt =~ s/{([^;{]*?);}/$1;/g; $new_txt =~ s/{([^;{]*?);}/$1;/g; } if ($old_txt ne $new_txt) { print $hunk; print $_; } $hunk = ""; $old_txt = ""; $new_txt = ""; next; } $hunk = $hunk . $_; if ($strip_slashes) { s/\\$//; } if ($_ =~ /^-/) { s/-//; s/[ \t\n]//g; $old_txt = $old_txt . $_; next; } if ($_ =~ /^\+/) { s/\+//; s/[ \t\n]//g; $new_txt = $new_txt . $_; next; } if ($_ =~ /^ /) { s/^ //; s/[ \t\n]//g; $old_txt = $old_txt . $_; $new_txt = $new_txt . $_; } } if ($old_txt ne $new_txt) { if ($strip_comments) { $old_txt =~ s/\/\*.*?\*\///g; $new_txt =~ s/\/\*.*?\*\///g; } if ($strip_braces) { $old_txt =~ s/{([^;{]*?);}/$1;/g; $new_txt =~ s/{([^;{]*?);}/$1;/g; $old_txt =~ s/{([^;{]*?);}/$1;/g; $new_txt =~ s/{([^;{]*?);}/$1;/g; } print $hunk; } unlink($oldfile); unlink($newfile); print "\ndone.\n"; [-- Attachment #3: Type: text/plain, Size: 169 bytes --] _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] staging: rtl8723bs: Use common packet header constants 2020-05-27 19:48 ` Dan Carpenter 2020-05-27 20:33 ` Pascal Terjan @ 2020-05-27 20:51 ` Pascal Terjan 2020-05-28 10:04 ` Dan Carpenter 1 sibling, 1 reply; 7+ messages in thread From: Pascal Terjan @ 2020-05-27 20:51 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel; +Cc: Pascal Terjan This driver contains a local version of the rfc1042 header and bridge tunnel header constants which are available from cfg80211.h, switch to those. Signed-off-by: Pascal Terjan <pterjan@google.com> --- v2: improve description and drop confusing cosmetic changes drivers/staging/rtl8723bs/core/rtw_recv.c | 9 +++------ drivers/staging/rtl8723bs/include/rtw_recv.h | 2 -- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 5 +++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index 5245098b9ecf..7e1da0e35812 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -10,14 +10,11 @@ #include <rtw_debug.h> #include <linux/jiffies.h> #include <rtw_recv.h> +#include <net/cfg80211.h> static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37}; static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3}; -u8 rtw_rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; -/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */ -u8 rtw_bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; - static void rtw_signal_stat_timer_hdl(struct timer_list *t); void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) @@ -1625,11 +1622,11 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe) psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; /* convert hdr + possible LLC headers into Ethernet header */ /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ - if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && + if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) && (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) && (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2))) || /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ - !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) { + !memcmp(psnap, bridge_tunnel_header, SNAP_SIZE)) { /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ bsnaphdr = true; } else diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 98c3e92245b7..a851b818ef0e 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -38,8 +38,6 @@ #define RX_MAX_QUEUE 2 #define MAX_SUBFRAME_COUNT 64 -extern u8 rtw_rfc1042_header[]; -extern u8 rtw_bridge_tunnel_header[]; /* for Rx reordering buffer control */ struct recv_reorder_ctrl diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c index 2a7b9922b1d4..eb4d1c3008fe 100644 --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c @@ -9,6 +9,7 @@ #include <drv_types.h> #include <rtw_debug.h> #include <linux/jiffies.h> +#include <net/cfg80211.h> void rtw_os_free_recvframe(union recv_frame *precvframe) { @@ -71,9 +72,9 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 eth_type = RTW_GET_BE16(&sub_skb->data[6]); if (sub_skb->len >= 8 && - ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) && + ((!memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) && eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || - !memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE))) { + !memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE))) { /* * remove RFC1042 or Bridge-Tunnel encapsulation and replace * EtherType -- 2.27.0.rc0.183.gde8f92d652-goog _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] staging: rtl8723bs: Use common packet header constants 2020-05-27 20:51 ` [PATCH v2] staging: rtl8723bs: Use common packet " Pascal Terjan @ 2020-05-28 10:04 ` Dan Carpenter 0 siblings, 0 replies; 7+ messages in thread From: Dan Carpenter @ 2020-05-28 10:04 UTC (permalink / raw) To: Pascal Terjan; +Cc: devel, Greg Kroah-Hartman, linux-kernel On Wed, May 27, 2020 at 09:51:00PM +0100, Pascal Terjan wrote: > This driver contains a local version of the rfc1042 header and bridge > tunnel header constants which are available from cfg80211.h, switch to > those. > > Signed-off-by: Pascal Terjan <pterjan@google.com> > --- > v2: improve description and drop confusing cosmetic changes Perfect! Thanks. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> regards, dan carpenter _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-05-28 10:04 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-23 21:29 [PATCH] staging: rtl8723bs: Use shared header constants Pascal Terjan 2020-05-27 8:15 ` Greg Kroah-Hartman 2020-05-27 19:48 ` Dan Carpenter 2020-05-27 20:33 ` Pascal Terjan 2020-05-28 9:16 ` Dan Carpenter 2020-05-27 20:51 ` [PATCH v2] staging: rtl8723bs: Use common packet " Pascal Terjan 2020-05-28 10:04 ` Dan Carpenter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).