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
d9d30adf
Commit
d9d30adf
authored
7 years ago
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
net: Kill NETIF_F_UFO and SKB_GSO_UDP.
No longer used. Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
6800b2e0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
20 deletions
+16
-20
include/linux/netdev_features.h
include/linux/netdev_features.h
+1
-3
include/linux/netdevice.h
include/linux/netdevice.h
+0
-1
include/linux/skbuff.h
include/linux/skbuff.h
+15
-16
No files found.
include/linux/netdev_features.h
View file @
d9d30adf
...
...
@@ -36,7 +36,6 @@ enum {
/**/
NETIF_F_GSO_SHIFT
,
/* keep the order of SKB_GSO_* bits */
NETIF_F_TSO_BIT
/* ... TCPv4 segmentation */
=
NETIF_F_GSO_SHIFT
,
NETIF_F_UFO_BIT
,
/* ... UDPv4 fragmentation */
NETIF_F_GSO_ROBUST_BIT
,
/* ... ->SKB_GSO_DODGY */
NETIF_F_TSO_ECN_BIT
,
/* ... TCP ECN support */
NETIF_F_TSO_MANGLEID_BIT
,
/* ... IPV4 ID mangling allowed */
...
...
@@ -118,7 +117,6 @@ enum {
#define NETIF_F_TSO6 __NETIF_F(TSO6)
#define NETIF_F_TSO_ECN __NETIF_F(TSO_ECN)
#define NETIF_F_TSO __NETIF_F(TSO)
#define NETIF_F_UFO __NETIF_F(UFO)
#define NETIF_F_VLAN_CHALLENGED __NETIF_F(VLAN_CHALLENGED)
#define NETIF_F_RXFCS __NETIF_F(RXFCS)
#define NETIF_F_RXALL __NETIF_F(RXALL)
...
...
@@ -172,7 +170,7 @@ enum {
NETIF_F_FSO)
/* List of features with software fallbacks. */
#define NETIF_F_GSO_SOFTWARE (NETIF_F_ALL_TSO |
NETIF_F_UFO |
\
#define NETIF_F_GSO_SOFTWARE (NETIF_F_ALL_TSO | \
NETIF_F_GSO_SCTP)
/*
...
...
This diff is collapsed.
Click to expand it.
include/linux/netdevice.h
View file @
d9d30adf
...
...
@@ -4098,7 +4098,6 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type)
/* check flags correspondence */
BUILD_BUG_ON
(
SKB_GSO_TCPV4
!=
(
NETIF_F_TSO
>>
NETIF_F_GSO_SHIFT
));
BUILD_BUG_ON
(
SKB_GSO_UDP
!=
(
NETIF_F_UFO
>>
NETIF_F_GSO_SHIFT
));
BUILD_BUG_ON
(
SKB_GSO_DODGY
!=
(
NETIF_F_GSO_ROBUST
>>
NETIF_F_GSO_SHIFT
));
BUILD_BUG_ON
(
SKB_GSO_TCP_ECN
!=
(
NETIF_F_TSO_ECN
>>
NETIF_F_GSO_SHIFT
));
BUILD_BUG_ON
(
SKB_GSO_TCP_FIXEDID
!=
(
NETIF_F_TSO_MANGLEID
>>
NETIF_F_GSO_SHIFT
));
...
...
This diff is collapsed.
Click to expand it.
include/linux/skbuff.h
View file @
d9d30adf
...
...
@@ -463,39 +463,38 @@ enum {
enum
{
SKB_GSO_TCPV4
=
1
<<
0
,
SKB_GSO_UDP
=
1
<<
1
,
/* This indicates the skb is from an untrusted source. */
SKB_GSO_DODGY
=
1
<<
2
,
SKB_GSO_DODGY
=
1
<<
1
,
/* This indicates the tcp segment has CWR set. */
SKB_GSO_TCP_ECN
=
1
<<
3
,
SKB_GSO_TCP_ECN
=
1
<<
2
,
SKB_GSO_TCP_FIXEDID
=
1
<<
4
,
SKB_GSO_TCP_FIXEDID
=
1
<<
3
,
SKB_GSO_TCPV6
=
1
<<
5
,
SKB_GSO_TCPV6
=
1
<<
4
,
SKB_GSO_FCOE
=
1
<<
6
,
SKB_GSO_FCOE
=
1
<<
5
,
SKB_GSO_GRE
=
1
<<
7
,
SKB_GSO_GRE
=
1
<<
6
,
SKB_GSO_GRE_CSUM
=
1
<<
8
,
SKB_GSO_GRE_CSUM
=
1
<<
7
,
SKB_GSO_IPXIP4
=
1
<<
9
,
SKB_GSO_IPXIP4
=
1
<<
8
,
SKB_GSO_IPXIP6
=
1
<<
10
,
SKB_GSO_IPXIP6
=
1
<<
9
,
SKB_GSO_UDP_TUNNEL
=
1
<<
1
1
,
SKB_GSO_UDP_TUNNEL
=
1
<<
1
0
,
SKB_GSO_UDP_TUNNEL_CSUM
=
1
<<
1
2
,
SKB_GSO_UDP_TUNNEL_CSUM
=
1
<<
1
1
,
SKB_GSO_PARTIAL
=
1
<<
1
3
,
SKB_GSO_PARTIAL
=
1
<<
1
2
,
SKB_GSO_TUNNEL_REMCSUM
=
1
<<
1
4
,
SKB_GSO_TUNNEL_REMCSUM
=
1
<<
1
3
,
SKB_GSO_SCTP
=
1
<<
1
5
,
SKB_GSO_SCTP
=
1
<<
1
4
,
SKB_GSO_ESP
=
1
<<
1
6
,
SKB_GSO_ESP
=
1
<<
1
5
,
};
#if BITS_PER_LONG > 32
...
...
This diff is collapsed.
Click to expand it.
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