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
nexedi
linux
Commits
590a9629
Commit
590a9629
authored
May 25, 2003
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[netdrvr bonding] minor merge/kbuild fixes
parent
d0aa9595
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
drivers/net/Makefile
drivers/net/Makefile
+1
-1
drivers/net/bonding/Makefile
drivers/net/bonding/Makefile
+2
-8
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_alb.c
+2
-0
No files found.
drivers/net/Makefile
View file @
590a9629
...
...
@@ -11,6 +11,7 @@ endif
obj-$(CONFIG_E100)
+=
e100/
obj-$(CONFIG_E1000)
+=
e1000/
obj-$(CONFIG_IXGB)
+=
ixgb/
obj-$(CONFIG_BONDING)
+=
bonding/
#
# link order important here
...
...
@@ -108,7 +109,6 @@ ifeq ($(CONFIG_SLIP_COMPRESSED),y)
endif
obj-$(CONFIG_DUMMY)
+=
dummy.o
obj-$(CONFIG_BONDING)
+=
bonding.o
obj-$(CONFIG_DE600)
+=
de600.o
obj-$(CONFIG_DE620)
+=
de620.o
obj-$(CONFIG_AT1500)
+=
lance.o
...
...
drivers/net/bonding/Makefile
View file @
590a9629
...
...
@@ -2,13 +2,7 @@
# Makefile for the Ethernet Bonding driver
#
O_TARGET
:
=
bonding.o
obj-$(CONFIG_BONDING)
+
=
bonding.o
obj-y
:=
bond_main.o
\
bond_3ad.o
\
bond_alb.o
obj-m
:=
$(O_TARGET)
include
$(TOPDIR)/Rules.make
bonding-objs
:=
bond_main.o bond_3ad.o bond_alb.o
drivers/net/bonding/bond_alb.c
View file @
590a9629
...
...
@@ -1255,6 +1255,7 @@ bond_alb_xmit(struct sk_buff *skb, struct net_device *dev)
hash_size
=
16
;
break
;
#ifdef FIXME
case
ETH_P_IPX
:
if
(
skb
->
nh
.
ipxh
->
ipx_checksum
!=
__constant_htons
(
IPX_NO_CHECKSUM
))
{
...
...
@@ -1276,6 +1277,7 @@ bond_alb_xmit(struct sk_buff *skb, struct net_device *dev)
hash_start
=
(
char
*
)
eth_data
->
h_dest
;
hash_size
=
ETH_ALEN
;
break
;
#endif
case
ETH_P_ARP
:
do_tx_balance
=
0
;
...
...
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