Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
d78c68ef
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d78c68ef
编写于
1月 15, 2011
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-david' of
git://git.open-mesh.org/ecsv/linux-merge
上级
16c0f936
aa0adb1a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
14 deletion
+16
-14
net/batman-adv/main.h
net/batman-adv/main.h
+3
-3
net/batman-adv/packet.h
net/batman-adv/packet.h
+7
-7
net/batman-adv/types.h
net/batman-adv/types.h
+2
-2
net/batman-adv/unicast.c
net/batman-adv/unicast.c
+4
-2
未找到文件。
net/batman-adv/main.h
浏览文件 @
d78c68ef
...
...
@@ -151,9 +151,9 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...);
} \
while (0)
#else
/* !CONFIG_BATMAN_ADV_DEBUG */
static
inline
void
bat_dbg
(
char
type
__a
ttribute__
((
unused
))
,
struct
bat_priv
*
bat_priv
__a
ttribute__
((
unused
))
,
char
*
fmt
__a
ttribute__
((
unused
))
,
...)
static
inline
void
bat_dbg
(
char
type
__a
lways_unused
,
struct
bat_priv
*
bat_priv
__a
lways_unused
,
char
*
fmt
__a
lways_unused
,
...)
{
}
#endif
...
...
net/batman-adv/packet.h
浏览文件 @
d78c68ef
...
...
@@ -63,7 +63,7 @@ struct batman_packet {
uint8_t
num_hna
;
uint8_t
gw_flags
;
/* flags related to gateway class */
uint8_t
align
;
}
__
attribute__
((
packed
))
;
}
__
packed
;
#define BAT_PACKET_LEN sizeof(struct batman_packet)
...
...
@@ -76,7 +76,7 @@ struct icmp_packet {
uint8_t
orig
[
6
];
uint16_t
seqno
;
uint8_t
uid
;
}
__
attribute__
((
packed
))
;
}
__
packed
;
#define BAT_RR_LEN 16
...
...
@@ -93,14 +93,14 @@ struct icmp_packet_rr {
uint8_t
uid
;
uint8_t
rr_cur
;
uint8_t
rr
[
BAT_RR_LEN
][
ETH_ALEN
];
}
__
attribute__
((
packed
))
;
}
__
packed
;
struct
unicast_packet
{
uint8_t
packet_type
;
uint8_t
version
;
/* batman version field */
uint8_t
dest
[
6
];
uint8_t
ttl
;
}
__
attribute__
((
packed
))
;
}
__
packed
;
struct
unicast_frag_packet
{
uint8_t
packet_type
;
...
...
@@ -110,7 +110,7 @@ struct unicast_frag_packet {
uint8_t
flags
;
uint8_t
orig
[
6
];
uint16_t
seqno
;
}
__
attribute__
((
packed
))
;
}
__
packed
;
struct
bcast_packet
{
uint8_t
packet_type
;
...
...
@@ -118,7 +118,7 @@ struct bcast_packet {
uint8_t
orig
[
6
];
uint8_t
ttl
;
uint32_t
seqno
;
}
__
attribute__
((
packed
))
;
}
__
packed
;
struct
vis_packet
{
uint8_t
packet_type
;
...
...
@@ -131,6 +131,6 @@ struct vis_packet {
* neighbors */
uint8_t
target_orig
[
6
];
/* who should receive this packet */
uint8_t
sender_orig
[
6
];
/* who sent or rebroadcasted this packet */
}
__
attribute__
((
packed
))
;
}
__
packed
;
#endif
/* _NET_BATMAN_ADV_PACKET_H_ */
net/batman-adv/types.h
浏览文件 @
d78c68ef
...
...
@@ -246,13 +246,13 @@ struct vis_info {
/* this packet might be part of the vis send queue. */
struct
sk_buff
*
skb_packet
;
/* vis_info may follow here*/
}
__
attribute__
((
packed
))
;
}
__
packed
;
struct
vis_info_entry
{
uint8_t
src
[
ETH_ALEN
];
uint8_t
dest
[
ETH_ALEN
];
uint8_t
quality
;
/* quality = 0 means HNA */
}
__
attribute__
((
packed
))
;
}
__
packed
;
struct
recvlist_node
{
struct
list_head
list
;
...
...
net/batman-adv/unicast.c
浏览文件 @
d78c68ef
...
...
@@ -229,10 +229,12 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
if
(
!
bat_priv
->
primary_if
)
goto
dropped
;
unicast_packet
=
(
struct
unicast_packet
*
)
skb
->
data
;
frag_skb
=
dev_alloc_skb
(
data_len
-
(
data_len
/
2
)
+
ucf_hdr_len
);
if
(
!
frag_skb
)
goto
dropped
;
unicast_packet
=
(
struct
unicast_packet
*
)
skb
->
data
;
memcpy
(
&
tmp_uc
,
unicast_packet
,
uc_hdr_len
);
frag_skb
=
dev_alloc_skb
(
data_len
-
(
data_len
/
2
)
+
ucf_hdr_len
);
skb_split
(
skb
,
frag_skb
,
data_len
/
2
);
if
(
my_skb_head_push
(
skb
,
ucf_hdr_len
-
uc_hdr_len
)
<
0
||
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录