[netdrvr bonding] minor merge/kbuild fixes

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

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
 

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;