[netdrvr bonding] minor merge/kbuild fixes

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c38b92a4693fb7444b453ca4e7d417bfa5d90591..cce3fa99684f4a0fc6e59f5aa118986ce308a7e7 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -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

diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile
index 5f3d6159a2ea6d79e654ce5ab7305555fdbccac5..cf50384b469e9c83f8e3ed81c4258f706176e017 100644 (file)
--- a/drivers/net/bonding/Makefile
+++ b/drivers/net/bonding/Makefile
@@ -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
 

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 1ad067d69a9db1b421ca2f8831358283842fee6f..4e0ec9b6361f68589d1cd5b6791f951660de2f9d 100644 (file)
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -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;