Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
341352d1
Commit
341352d1
authored
May 08, 2012
by
John W. Linville
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iwlwifi: fix-up some merge damage from commit
0d6c4a2e
Signed-off-by:
John W. Linville
<
linville@tuxdriver.com
>
parent
70c33eaa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+2
-1
No files found.
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
View file @
341352d1
...
...
@@ -764,7 +764,8 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
fraglen
=
len
-
hdrlen
;
if
(
fraglen
)
{
int
offset
=
(
void
*
)
hdr
-
rxb_addr
(
rxb
)
+
rxb_offset
(
rxb
);
int
offset
=
(
void
*
)
hdr
+
hdrlen
-
rxb_addr
(
rxb
)
+
rxb_offset
(
rxb
);
skb_add_rx_frag
(
skb
,
0
,
rxb_steal_page
(
rxb
),
offset
,
fraglen
,
rxb
->
truesize
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment