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
33a9c4da
Commit
33a9c4da
authored
Jan 16, 2006
by
Per Liden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TIPC] Move ethernet protocol id to linux/if_ether.h
Signed-off-by:
Per Liden
<
per.liden@ericsson.com
>
parent
7c2b2aae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
include/linux/if_ether.h
include/linux/if_ether.h
+1
-0
net/tipc/eth_media.c
net/tipc/eth_media.c
+2
-3
No files found.
include/linux/if_ether.h
View file @
33a9c4da
...
...
@@ -72,6 +72,7 @@
* over Ethernet
*/
#define ETH_P_AOE 0x88A2
/* ATA over Ethernet */
#define ETH_P_TIPC 0x88CA
/* TIPC */
/*
* Non DIX types. Won't clash for 1500 types.
...
...
net/tipc/eth_media.c
View file @
33a9c4da
...
...
@@ -41,7 +41,6 @@
#include <linux/version.h>
#define MAX_ETH_BEARERS 2
#define TIPC_PROTOCOL 0x88ca
#define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI
#define ETH_LINK_TOLERANCE TIPC_DEF_LINK_TOL
#define ETH_LINK_WINDOW TIPC_DEF_LINK_WIN
...
...
@@ -78,7 +77,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
clone
->
nh
.
raw
=
clone
->
data
;
dev
=
((
struct
eth_bearer
*
)(
tb_ptr
->
usr_handle
))
->
dev
;
clone
->
dev
=
dev
;
dev
->
hard_header
(
clone
,
dev
,
TIPC_PROTOCOL
,
dev
->
hard_header
(
clone
,
dev
,
ETH_P_TIPC
,
&
dest
->
dev_addr
.
eth_addr
,
dev
->
dev_addr
,
clone
->
len
);
dev_queue_xmit
(
clone
);
...
...
@@ -141,7 +140,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
return
-
EDQUOT
;
if
(
!
eb_ptr
->
dev
)
{
eb_ptr
->
dev
=
dev
;
eb_ptr
->
tipc_packet_type
.
type
=
__constant_htons
(
TIPC_PROTOCOL
);
eb_ptr
->
tipc_packet_type
.
type
=
__constant_htons
(
ETH_P_TIPC
);
eb_ptr
->
tipc_packet_type
.
dev
=
dev
;
eb_ptr
->
tipc_packet_type
.
func
=
recv_msg
;
eb_ptr
->
tipc_packet_type
.
af_packet_priv
=
eb_ptr
;
...
...
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