Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
d9d30adf
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d9d30adf
编写于
7月 03, 2017
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
net: Kill NETIF_F_UFO and SKB_GSO_UDP.
No longer used. Signed-off-by:
N
David S. Miller
<
davem@davemloft.net
>
上级
6800b2e0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
20 deletion
+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
未找到文件。
include/linux/netdev_features.h
浏览文件 @
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)
/*
...
...
include/linux/netdevice.h
浏览文件 @
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
));
...
...
include/linux/skbuff.h
浏览文件 @
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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录