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
Kirill Smelkov
linux
Commits
e0048402
Commit
e0048402
authored
Dec 02, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
parents
3248e168
1f5865e7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
38 deletions
+3
-38
Documentation/networking/ip-sysctl.txt
Documentation/networking/ip-sysctl.txt
+2
-2
drivers/net/atl1e/atl1e_main.c
drivers/net/atl1e/atl1e_main.c
+0
-36
drivers/net/bnx2.c
drivers/net/bnx2.c
+1
-0
No files found.
Documentation/networking/ip-sysctl.txt
View file @
e0048402
...
...
@@ -738,8 +738,8 @@ rp_filter - INTEGER
to prevent IP spoofing from DDos attacks. If using asymmetric routing
or other complicated routing, then loose mode is recommended.
conf/all/rp_filter must also be set to non-zero to do source validation
on the interface
The max value from conf/{all,interface}/rp_filter is used
when doing source validation on the {interface}.
Default value is 0. Note that some distributions enable it
in startup scripts.
...
...
drivers/net/atl1e/atl1e_main.c
View file @
e0048402
...
...
@@ -1664,41 +1664,6 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter,
}
return
0
;
}
if
(
offload_type
&
SKB_GSO_TCPV6
)
{
real_len
=
(((
unsigned
char
*
)
ipv6_hdr
(
skb
)
-
skb
->
data
)
+
ntohs
(
ipv6_hdr
(
skb
)
->
payload_len
));
if
(
real_len
<
skb
->
len
)
pskb_trim
(
skb
,
real_len
);
/* check payload == 0 byte ? */
hdr_len
=
(
skb_transport_offset
(
skb
)
+
tcp_hdrlen
(
skb
));
if
(
unlikely
(
skb
->
len
==
hdr_len
))
{
/* only xsum need */
dev_warn
(
&
pdev
->
dev
,
"IPV6 tso with zero data??
\n
"
);
goto
check_sum
;
}
else
{
tcp_hdr
(
skb
)
->
check
=
~
csum_ipv6_magic
(
&
ipv6_hdr
(
skb
)
->
saddr
,
&
ipv6_hdr
(
skb
)
->
daddr
,
0
,
IPPROTO_TCP
,
0
);
tpd
->
word3
|=
1
<<
TPD_IP_VERSION_SHIFT
;
hdr_len
>>=
1
;
tpd
->
word3
|=
(
hdr_len
&
TPD_V6_IPHLLO_MASK
)
<<
TPD_V6_IPHLLO_SHIFT
;
tpd
->
word3
|=
((
hdr_len
>>
3
)
&
TPD_V6_IPHLHI_MASK
)
<<
TPD_V6_IPHLHI_SHIFT
;
tpd
->
word3
|=
(
tcp_hdrlen
(
skb
)
>>
2
&
TPD_TCPHDRLEN_MASK
)
<<
TPD_TCPHDRLEN_SHIFT
;
tpd
->
word3
|=
((
skb_shinfo
(
skb
)
->
gso_size
)
&
TPD_MSS_MASK
)
<<
TPD_MSS_SHIFT
;
tpd
->
word3
|=
1
<<
TPD_SEGMENT_EN_SHIFT
;
}
}
return
0
;
}
check_sum:
...
...
@@ -2287,7 +2252,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
NETIF_F_HW_VLAN_TX
|
NETIF_F_HW_VLAN_RX
;
netdev
->
features
|=
NETIF_F_LLTX
;
netdev
->
features
|=
NETIF_F_TSO
;
netdev
->
features
|=
NETIF_F_TSO6
;
return
0
;
}
...
...
drivers/net/bnx2.c
View file @
e0048402
...
...
@@ -8316,6 +8316,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
}
pci_set_master
(
pdev
);
pci_restore_state
(
pdev
);
pci_save_state
(
pdev
);
if
(
netif_running
(
dev
))
{
bnx2_set_power_state
(
bp
,
PCI_D0
);
...
...
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